fix 广告

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ActivityAdvertisingController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 广告发布储存Controller
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Api(value = "广告发布储存控制器", tags = {"广告发布储存管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/base/advertising")
+public class ActivityAdvertisingController extends BaseController {
+
+    private final IActivityAdvertisingService iActivityAdvertisingService;
+
+    /**
+     * 查询广告发布储存列表
+     */
+    @ApiOperation("查询广告发布储存列表")
+    @PreAuthorize("@ss.hasPermi('system:advertising:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityAdvertisingVo> list(ActivityAdvertisingQueryBo bo) {
+        startPage();
+        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出广告发布储存列表
+     */
+   /* @ApiOperation("导出广告发布储存列表")
+    @PreAuthorize("@ss.hasPermi('system:advertising:export')")
+    @Log(title = "广告发布储存", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ActivityAdvertisingVo> export(ActivityAdvertisingQueryBo bo) {
+        List<ActivityAdvertisingVo> list = iActivityAdvertisingService.queryList(bo);
+        ExcelUtil<ActivityAdvertisingVo> util = new ExcelUtil<ActivityAdvertisingVo>(ActivityAdvertisingVo.class);
+        return util.exportExcel(list, "广告发布储存");
+    }*/
+
+    /**
+     * 获取广告发布储存详细信息
+     */
+    @ApiOperation("获取广告发布储存详细信息")
+    @PreAuthorize("@ss.hasPermi('system:advertising:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ActivityAdvertisingVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iActivityAdvertisingService.queryById(id));
+    }
+
+    /**
+     * 新增广告发布储存
+     */
+    @ApiOperation("新增广告发布储存")
+    @PreAuthorize("@ss.hasPermi('system:advertising:add')")
+    @Log(title = "广告发布储存", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ActivityAdvertisingAddBo bo) {
+        return toAjax(iActivityAdvertisingService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改广告发布储存
+     */
+    @ApiOperation("修改广告发布储存")
+    @PreAuthorize("@ss.hasPermi('system:advertising:edit')")
+    @Log(title = "广告发布储存", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody ActivityAdvertisingEditBo bo) {
+        return toAjax(iActivityAdvertisingService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除广告发布储存
+     */
+   /* @ApiOperation("删除广告发布储存")
+    @PreAuthorize("@ss.hasPermi('system:advertising:remove')")
+    @Log(title = "广告发布储存" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iActivityAdvertisingService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ActivityAdvertisingAddBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 广告发布储存添加对象 activity_advertising
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@ApiModel("广告发布储存添加对象")
+public class ActivityAdvertisingAddBo {
+
+    /** 广告图片 */
+    @ApiModelProperty("广告图片")
+    private String adverUrl;
+    /** 跳转url */
+    @ApiModelProperty("跳转url")
+    private String jumpUrl;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remarks;
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+    /** 跳转类型 1无跳转 2url 3内部接口 外部接口 */
+    @ApiModelProperty("跳转类型 1无跳转 2url 3内部接口 外部接口")
+    private Integer jumpType;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+    /** 广告名称 */
+    @ApiModelProperty("广告名称")
+    private String advName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ActivityAdvertisingEditBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 广告发布储存编辑对象 activity_advertising
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@ApiModel("广告发布储存编辑对象")
+public class ActivityAdvertisingEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 广告图片 */
+    @ApiModelProperty("广告图片")
+    private String adverUrl;
+
+    /** 跳转url */
+    @ApiModelProperty("跳转url")
+    private String jumpUrl;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+
+    /** 跳转类型 1无跳转 2url 3内部接口 外部接口 */
+    @ApiModelProperty("跳转类型 1无跳转 2url 3内部接口 外部接口")
+    private Integer jumpType;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    /** 广告名称 */
+    @ApiModelProperty("广告名称")
+    private String advName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ActivityAdvertisingQueryBo.java

@@ -0,0 +1,61 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 广告发布储存分页查询对象 activity_advertising
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("广告发布储存分页查询对象")
+public class ActivityAdvertisingQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 广告图片 */
+	@ApiModelProperty("广告图片")
+	private String adverUrl;
+	/** 跳转url */
+	@ApiModelProperty("跳转url")
+	private String jumpUrl;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private List<Integer> status;
+	/** 跳转类型 1无跳转 2url 3内部接口 外部接口 */
+	@ApiModelProperty("跳转类型 1无跳转 2url 3内部接口 外部接口")
+	private Integer jumpType;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
+	/** 广告名称 */
+	@ApiModelProperty("广告名称")
+	private String advName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ActivityAdvertising.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.base.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 广告发布储存对象 activity_advertising
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_advertising")
+public class ActivityAdvertising implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 广告图片 */
+    private String adverUrl;
+    /** 跳转url */
+    private String jumpUrl;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 备注 */
+    private String remarks;
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    private Integer status;
+    /** 跳转类型 1无跳转 2url 3内部接口 外部接口 */
+    private Integer jumpType;
+    /** 排序 */
+    private Integer sort;
+    /** 广告名称 */
+    private String advName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/ActivityAdvertisingMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.domain.ActivityAdvertising;
+
+/**
+ * 广告发布储存Mapper接口
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+public interface ActivityAdvertisingMapper extends BaseMapper<ActivityAdvertising> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IActivityAdvertisingService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.base.domain.ActivityAdvertising;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 广告发布储存Service接口
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+public interface IActivityAdvertisingService extends IService<ActivityAdvertising> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityAdvertisingVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入广告发布储存
+	 * @param bo 广告发布储存新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityAdvertisingAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改广告发布储存
+	 * @param bo 广告发布储存编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityAdvertisingEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ActivityAdvertisingServiceImpl.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.modules.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
+import com.zhongzheng.modules.base.domain.ActivityAdvertising;
+import com.zhongzheng.modules.base.mapper.ActivityAdvertisingMapper;
+import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 广告发布储存Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Service
+public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertisingMapper, ActivityAdvertising> implements IActivityAdvertisingService {
+
+    @Override
+    public ActivityAdvertisingVo queryById(Long id){
+        ActivityAdvertising db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ActivityAdvertisingVo.class);
+    }
+
+    @Override
+    public List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo) {
+        LambdaQueryWrapper<ActivityAdvertising> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getAdverUrl()), ActivityAdvertising::getAdverUrl, bo.getAdverUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getJumpUrl()), ActivityAdvertising::getJumpUrl, bo.getJumpUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
+        lqw.in(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
+        lqw.eq(bo.getJumpType() != null, ActivityAdvertising::getJumpType, bo.getJumpType());
+        lqw.eq(bo.getSort() != null, ActivityAdvertising::getSort, bo.getSort());
+        lqw.like(StrUtil.isNotBlank(bo.getAdvName()), ActivityAdvertising::getAdvName, bo.getAdvName());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityAdvertisingVo> entity2Vo(Collection<ActivityAdvertising> collection) {
+        List<ActivityAdvertisingVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityAdvertisingVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityAdvertising> page = (Page<ActivityAdvertising>)collection;
+            Page<ActivityAdvertisingVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityAdvertisingAddBo bo) {
+        ActivityAdvertising add = BeanUtil.toBean(bo, ActivityAdvertising.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityAdvertisingEditBo bo) {
+        ActivityAdvertising update = BeanUtil.toBean(bo, ActivityAdvertising.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityAdvertising entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/ActivityAdvertisingVo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.base.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 广告发布储存视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@ApiModel("广告发布储存视图对象")
+public class ActivityAdvertisingVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 广告图片 */
+	@Excel(name = "广告图片")
+	@ApiModelProperty("广告图片")
+	private String adverUrl;
+	/** 跳转url */
+	@Excel(name = "跳转url")
+	@ApiModelProperty("跳转url")
+	private String jumpUrl;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@Excel(name = "0删除 1待发布 2 撤回 3发布成功")
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
+	/** 跳转类型 1无跳转 2url 3内部接口 外部接口 */
+	@Excel(name = "跳转类型 1无跳转 2url 3内部接口 外部接口")
+	@ApiModelProperty("跳转类型 1无跳转 2url 3内部接口 外部接口")
+	private Integer jumpType;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
+	/** 广告名称 */
+	@Excel(name = "广告名称")
+	@ApiModelProperty("广告名称")
+	private String advName;
+}

zhongzheng-system/src/main/resources/mapper/modules/base/ActivityAdvertisingMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.base.mapper.ActivityAdvertisingMapper">
+
+    <resultMap type="com.zhongzheng.modules.base.domain.ActivityAdvertising" id="ActivityAdvertisingResult">
+        <result property="id" column="id"/>
+        <result property="adverUrl" column="adver_url"/>
+        <result property="jumpUrl" column="jump_url"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remarks" column="remarks"/>
+        <result property="status" column="status"/>
+        <result property="jumpType" column="jump_type"/>
+        <result property="sort" column="sort"/>
+        <result property="advName" column="adv_name"/>
+    </resultMap>
+
+
+</mapper>