fix 广告

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

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationQueryBo;
+import com.zhongzheng.modules.base.service.IActivityAdvertisingLocationService;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingLocationVo;
+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/adv/location")
+public class ActivityAdvertisingLocationController extends BaseController {
+
+    private final IActivityAdvertisingLocationService iActivityAdvertisingLocationService;
+
+    /**
+     * 查询广告位列表
+     */
+    @ApiOperation("查询广告位列表")
+    @PreAuthorize("@ss.hasPermi('system:location:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityAdvertisingLocationVo> list(ActivityAdvertisingLocationQueryBo bo) {
+        startPage();
+        List<ActivityAdvertisingLocationVo> list = iActivityAdvertisingLocationService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出广告位列表
+     */
+    /*@ApiOperation("导出广告位列表")
+    @PreAuthorize("@ss.hasPermi('system:location:export')")
+    @Log(title = "广告位", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ActivityAdvertisingLocationVo> export(ActivityAdvertisingLocationQueryBo bo) {
+        List<ActivityAdvertisingLocationVo> list = iActivityAdvertisingLocationService.queryList(bo);
+        ExcelUtil<ActivityAdvertisingLocationVo> util = new ExcelUtil<ActivityAdvertisingLocationVo>(ActivityAdvertisingLocationVo.class);
+        return util.exportExcel(list, "广告位");
+    }*/
+
+    /**
+     * 获取广告位详细信息
+     */
+    @ApiOperation("获取广告位详细信息")
+    @PreAuthorize("@ss.hasPermi('system:location:query')")
+    @GetMapping("/{locationId}")
+    public AjaxResult<ActivityAdvertisingLocationVo> getInfo(@PathVariable("locationId" ) Long locationId) {
+        return AjaxResult.success(iActivityAdvertisingLocationService.queryById(locationId));
+    }
+
+    /**
+     * 新增广告位
+     */
+    @ApiOperation("新增广告位")
+    @PreAuthorize("@ss.hasPermi('system:location:add')")
+    @Log(title = "广告位", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ActivityAdvertisingLocationAddBo bo) {
+        return toAjax(iActivityAdvertisingLocationService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改广告位
+     */
+    @ApiOperation("修改广告位")
+    @PreAuthorize("@ss.hasPermi('system:location:edit')")
+    @Log(title = "广告位", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody ActivityAdvertisingLocationEditBo bo) {
+        return toAjax(iActivityAdvertisingLocationService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除广告位
+     */
+   /* @ApiOperation("删除广告位")
+    @PreAuthorize("@ss.hasPermi('system:location:remove')")
+    @Log(title = "广告位" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{locationIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] locationIds) {
+        return toAjax(iActivityAdvertisingLocationService.deleteWithValidByIds(Arrays.asList(locationIds), true) ? 1 : 0);
+    }*/
+}

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

@@ -33,15 +33,18 @@ public class ActivityAdvertisingAddBo {
     /** 备注 */
     @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;
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
     /** 排序 */
     @ApiModelProperty("排序")
     private Integer sort;
+    /** 广告位ID */
+    @ApiModelProperty("广告位ID")
+    private Long locationId;
     /** 广告名称 */
     @ApiModelProperty("广告名称")
     private String advName;

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

@@ -38,18 +38,22 @@ public class ActivityAdvertisingEditBo {
     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;
 
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+
     /** 排序 */
     @ApiModelProperty("排序")
     private Integer sort;
 
+    /** 广告位ID */
+    @ApiModelProperty("广告位ID")
+    private Long locationId;
+
     /** 广告名称 */
     @ApiModelProperty("广告名称")
     private String advName;

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

@@ -0,0 +1,39 @@
+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_location
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@ApiModel("广告位添加对象")
+public class ActivityAdvertisingLocationAddBo {
+
+    /** 位置名称 */
+    @ApiModelProperty("位置名称")
+    private String name;
+    /** 间隔秒数 */
+    @ApiModelProperty("间隔秒数")
+    private Integer intervalTime;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 0关闭 1启动 -1删除 */
+    @ApiModelProperty("0关闭 1启动 -1删除")
+    private Integer status;
+    /** 键名 */
+    @ApiModelProperty("键名")
+    private String locationKey;
+}

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

@@ -0,0 +1,44 @@
+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_location
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@ApiModel("广告位编辑对象")
+public class ActivityAdvertisingLocationEditBo {
+
+    /** 位置ID */
+    @ApiModelProperty("位置ID")
+    private Long locationId;
+
+    /** 位置名称 */
+    @ApiModelProperty("位置名称")
+    private String name;
+
+    /** 间隔秒数 */
+    @ApiModelProperty("间隔秒数")
+    private Integer intervalTime;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 0关闭 1启动 -1删除 */
+    @ApiModelProperty("0关闭 1启动 -1删除")
+    private Integer status;
+
+    /** 键名 */
+    @ApiModelProperty("键名")
+    private String locationKey;
+
+}

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

@@ -0,0 +1,51 @@
+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.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 广告位分页查询对象 activity_advertising_location
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("广告位分页查询对象")
+public class ActivityAdvertisingLocationQueryBo 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 name;
+	/** 间隔秒数 */
+	@ApiModelProperty("间隔秒数")
+	private Integer intervalTime;
+	/** 0关闭 1启动 -1删除 */
+	@ApiModelProperty("0关闭 1启动 -1删除")
+	private Integer status;
+	/** 键名 */
+	@ApiModelProperty("键名")
+	private String locationKey;
+}

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -46,15 +45,18 @@ public class ActivityAdvertisingQueryBo extends BaseEntity {
 	/** 备注 */
 	@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;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;
+	/** 广告位ID */
+	@ApiModelProperty("广告位ID")
+	private Long locationId;
 	/** 广告名称 */
 	@ApiModelProperty("广告名称")
 	private String advName;

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

@@ -38,12 +38,14 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 备注 */
     private String remarks;
-    /** 0删除 1待发布 2 撤回 3发布成功 */
-    private Integer status;
     /** 跳转类型 1无跳转 2url 3内部接口 外部接口 */
     private Integer jumpType;
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    private Integer status;
     /** 排序 */
     private Integer sort;
+    /** 广告位ID */
+    private Long locationId;
     /** 广告名称 */
     private String advName;
 }

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

@@ -0,0 +1,43 @@
+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_location
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_advertising_location")
+public class ActivityAdvertisingLocation implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 位置ID */
+    @TableId(value = "location_id")
+    private Long locationId;
+    /** 位置名称 */
+    private String name;
+    /** 间隔秒数 */
+    private Integer intervalTime;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 0关闭 1启动 -1删除 */
+    private Integer status;
+    /** 键名 */
+    private String locationKey;
+}

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

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

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationQueryBo;
+import com.zhongzheng.modules.base.domain.ActivityAdvertisingLocation;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingLocationVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 广告位Service接口
+ *
+ * @author hjl
+ * @date 2022-01-13
+ */
+public interface IActivityAdvertisingLocationService extends IService<ActivityAdvertisingLocation> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityAdvertisingLocationVo queryById(Long locationId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityAdvertisingLocationVo> queryList(ActivityAdvertisingLocationQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入广告位
+	 * @param bo 广告位新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityAdvertisingLocationAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改广告位
+	 * @param bo 广告位编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityAdvertisingLocationEditBo 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/ActivityAdvertisingLocationServiceImpl.java

@@ -0,0 +1,102 @@
+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.ActivityAdvertisingLocationAddBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationEditBo;
+import com.zhongzheng.modules.base.bo.ActivityAdvertisingLocationQueryBo;
+import com.zhongzheng.modules.base.domain.ActivityAdvertisingLocation;
+import com.zhongzheng.modules.base.mapper.ActivityAdvertisingLocationMapper;
+import com.zhongzheng.modules.base.service.IActivityAdvertisingLocationService;
+import com.zhongzheng.modules.base.vo.ActivityAdvertisingLocationVo;
+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 ActivityAdvertisingLocationServiceImpl extends ServiceImpl<ActivityAdvertisingLocationMapper, ActivityAdvertisingLocation> implements IActivityAdvertisingLocationService {
+
+    @Override
+    public ActivityAdvertisingLocationVo queryById(Long locationId){
+        ActivityAdvertisingLocation db = this.baseMapper.selectById(locationId);
+        return BeanUtil.toBean(db, ActivityAdvertisingLocationVo.class);
+    }
+
+    @Override
+    public List<ActivityAdvertisingLocationVo> queryList(ActivityAdvertisingLocationQueryBo bo) {
+        LambdaQueryWrapper<ActivityAdvertisingLocation> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getName()), ActivityAdvertisingLocation::getName, bo.getName());
+        lqw.eq(bo.getIntervalTime() != null, ActivityAdvertisingLocation::getIntervalTime, bo.getIntervalTime());
+        lqw.eq(bo.getStatus() != null, ActivityAdvertisingLocation::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getLocationKey()), ActivityAdvertisingLocation::getLocationKey, bo.getLocationKey());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityAdvertisingLocationVo> entity2Vo(Collection<ActivityAdvertisingLocation> collection) {
+        List<ActivityAdvertisingLocationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityAdvertisingLocationVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityAdvertisingLocation> page = (Page<ActivityAdvertisingLocation>)collection;
+            Page<ActivityAdvertisingLocationVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityAdvertisingLocationAddBo bo) {
+        ActivityAdvertisingLocation add = BeanUtil.toBean(bo, ActivityAdvertisingLocation.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityAdvertisingLocationEditBo bo) {
+        ActivityAdvertisingLocation update = BeanUtil.toBean(bo, ActivityAdvertisingLocation.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityAdvertisingLocation 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/service/impl/ActivityAdvertisingServiceImpl.java

@@ -40,6 +40,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
     public List<ActivityAdvertisingVo> queryList(ActivityAdvertisingQueryBo bo) {
         LambdaQueryWrapper<ActivityAdvertising> lqw = Wrappers.lambdaQuery();
         lqw.eq(StrUtil.isNotBlank(bo.getAdverUrl()), ActivityAdvertising::getAdverUrl, bo.getAdverUrl());
+        lqw.eq(bo.getLocationId() != null, ActivityAdvertising::getLocationId, bo.getLocationId());
         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());

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

@@ -0,0 +1,43 @@
+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 ActivityAdvertisingLocationVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 位置ID */
+	@ApiModelProperty("位置ID")
+	private Long locationId;
+
+	/** 位置名称 */
+	@Excel(name = "位置名称")
+	@ApiModelProperty("位置名称")
+	private String name;
+	/** 间隔秒数 */
+	@Excel(name = "间隔秒数")
+	@ApiModelProperty("间隔秒数")
+	private Integer intervalTime;
+	/** 0关闭 1启动 -1删除 */
+	@Excel(name = "0关闭 1启动 -1删除")
+	@ApiModelProperty("0关闭 1启动 -1删除")
+	private Integer status;
+	/** 键名 */
+	@Excel(name = "键名")
+	@ApiModelProperty("键名")
+	private String locationKey;
+}

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

@@ -36,18 +36,22 @@ public class ActivityAdvertisingVo {
 	@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;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@Excel(name = "0删除 1待发布 2 撤回 3发布成功")
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
 	/** 排序 */
 	@Excel(name = "排序")
 	@ApiModelProperty("排序")
 	private Integer sort;
+	/** 广告位ID */
+	@Excel(name = "广告位ID")
+	@ApiModelProperty("广告位ID")
+	private Long locationId;
 	/** 广告名称 */
 	@Excel(name = "广告名称")
 	@ApiModelProperty("广告名称")

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

@@ -0,0 +1,18 @@
+<?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.ActivityAdvertisingLocationMapper">
+
+    <resultMap type="com.zhongzheng.modules.base.domain.ActivityAdvertisingLocation" id="ActivityAdvertisingLocationResult">
+        <result property="locationId" column="location_id"/>
+        <result property="name" column="name"/>
+        <result property="intervalTime" column="interval_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="locationKey" column="location_key"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jumpType" column="jump_type"/>
         <result property="sort" column="sort"/>
         <result property="advName" column="adv_name"/>
+        <result property="locationId" column="location_id"/>
     </resultMap>