banners 根据之前的需求完善

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersSearchParam.java

@@ -16,16 +16,16 @@ import java.io.Serializable;
 @Data
 public class BannersSearchParam implements Serializable {
     @ApiModelProperty(value = "标题", example = "这是一个banner标题")
-    private String name;
+    private String bannersName;
 
-    @ApiModelProperty(value = "跳转类型 6演出跳转 7商品跳转 8巡演跳转 12展示分享按钮的web连接 14积分商品详情 100活动跳转 999不跳转 998个人信息跳转", example = "6")
-    private Integer type;
+    @ApiModelProperty(value = "跳转类型(由接口提供)", example = "6")
+    private Integer targetType;
 
-    @ApiModelProperty(value = "是否显示 0-否,1-是", example = "1", allowableValues = "0,1")
-    private Integer isShow;
+    @ApiModelProperty(value = "是否上线展示 0下线 1上线", example = "1", allowableValues = "0,1")
+    private Integer isOnline;
 
-    @ApiModelProperty(value = "展示位置", example = "1")
-    private Integer position;
+    @ApiModelProperty(value = "推广类型 1全国 2省份", example = "1", allowableValues = "1,2")
+    private Integer promotionType;
 
     @ApiModelProperty(value = "页数 ", example = "1")
     private int page;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BannersVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -50,6 +51,12 @@ public class BannersVo implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty(value = "展示的位置 多选 数组")
+    private List positionList;
+
+    @ApiModelProperty(value = "推广省份 多选 数组")
+    private List provincesList;
+
     @ApiModelProperty(value = "是否删除 0已删除,1正常")
     private Integer isDeleted;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsDao.java

@@ -13,28 +13,34 @@ public class BannerDetailsDao implements Serializable {
     private String bannersId;
 
     @ApiModelProperty(value = "标题")
-    private String name;
+    private String bannersName;
 
     @ApiModelProperty(value = "封面图")
     private String coverImg;
 
-    @ApiModelProperty(value = "跳转目标id或者url")
-    private String targetId;
+    @ApiModelProperty(value = "跳转类型(由接口提供)")
+    private String targetType;
 
-    @ApiModelProperty(value = "跳转类型 6演出跳转 7商品跳转 8巡演跳转 12展示分享按钮的web连接 14积分商品详情 100活动跳转 999不跳转 998个人信息跳转")
-    private Integer type;
+    @ApiModelProperty(value = "跳转目标 id/url等")
+    private String targetObj;
 
-    @ApiModelProperty(value = "是否显示 0-否,1-是")
-    private Integer isShow;
+    @ApiModelProperty(value = "是否上线展示 0下线 1上线")
+    private Integer isOnline;
 
-    @ApiModelProperty(value = "展示位置")
-    private Integer position;
+    @ApiModelProperty(value = "上线开始时间")
+    private String onlineStartTime;
 
-    @ApiModelProperty(value = "排序权重 越大越靠前")
-    private Integer sort;
+    @ApiModelProperty(value = "上线结束时间")
+    private String onlineEndTime;
+
+    @ApiModelProperty(value = "推广类型 1全国 2省份")
+    private Integer promotionType;
+
+    @ApiModelProperty(value = "排序 越大越靠前")
+    private Integer bannersSort;
 
     @ApiModelProperty(value = "备注")
-    private String comment;
+    private String remarks;
 
     @ApiModelProperty(value = "创建时间")
     private String  createdAt;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsListDao.java

 package com.liquidnet.service.kylin.dao;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,21 +9,42 @@ import java.io.Serializable;
 @Data
 public class BannerDetailsListDao implements Serializable {
 
+    @ApiModelProperty(value = "Banner主键ID")
     private String bannersId;
 
-    private String name;
+    @ApiModelProperty(value = "标题")
+    private String bannersName;
 
+    @ApiModelProperty(value = "封面图")
     private String coverImg;
 
-    private String targetId;
+    @ApiModelProperty(value = "跳转类型(由接口提供)")
+    private String targetType;
 
-    private Integer type;
+    @ApiModelProperty(value = "跳转目标 id/url等")
+    private String targetObj;
 
-    private Integer isShow;
+    @ApiModelProperty(value = "是否上线展示 0下线 1上线")
+    private Integer isOnline;
 
-    private Integer position;
+    @ApiModelProperty(value = "上线开始时间")
+    private String onlineStartTime;
 
-    private Integer sort;
+    @ApiModelProperty(value = "上线结束时间")
+    private String onlineEndTime;
 
-    private String comment;
+    @ApiModelProperty(value = "推广类型 1全国 2省份")
+    private Integer promotionType;
+
+    @ApiModelProperty(value = "排序 越大越靠前")
+    private Integer bannersSort;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "创建时间")
+    private String  createdAt;
+
+    @ApiModelProperty(value = "修改时间")
+    private String updatedAt;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBanners.java

 package com.liquidnet.service.kylin.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Transient;
 
 /**
  * <p>
@@ -79,6 +83,18 @@ public class KylinBanners implements Serializable {
      */
     private String remarks;
 
+    /**
+     * 位置
+     */
+    @TableField(exist = false)
+    private List<String> positionList;
+
+    /**
+     * 城市
+     */
+    @TableField(exist = false)
+    private List<String> provincesList;
+
     /**
      * 是否删除 1正常 已删除
      */

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinBannersRelationsMapper.java

@@ -15,5 +15,5 @@ import java.util.List;
  */
 public interface KylinBannersRelationsMapper extends BaseMapper<KylinBannersRelations> {
     //列表
-    List<String> getBannersRelationsId(String bannersId, int fieldIdType);
+    List<String> getBannersRelationsField(String field, String bannersId, int fieldIdType);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinBannersMapper.xml

@@ -4,14 +4,16 @@
     <!-- 详情 -->
     <resultMap id="bannerDetailsResult" type="com.liquidnet.service.kylin.dao.BannerDetailsDao">
         <result column="banners_id" property="bannersId"/>
-        <result column="name" property="name"/>
+        <result column="banners_name" property="bannersName"/>
         <result column="cover_img" property="coverImg"/>
-        <result column="target_id" property="targetId"/>
-        <result column="type" property="type"/>
-        <result column="is_show" property="isShow"/>
-        <result column="position" property="position"/>
-        <result column="sort" property="sort"/>
-        <result column="comment" property="comment"/>
+        <result column="target_type" property="targetType"/>
+        <result column="target_obj" property="targetObj"/>
+        <result column="is_online" property="isOnline"/>
+        <result column="online_start_time" property="onlineStartTime"/>
+        <result column="online_end_time" property="onlineEndTime"/>
+        <result column="promotion_type" property="promotionType"/>
+        <result column="banners_sort" property="bannersSort"/>
+        <result column="remarks" property="remarks"/>
         <result column="created_at" property="createdAt"/>
         <result column="updated_at" property="updatedAt"/>
     </resultMap>
@@ -31,20 +33,20 @@
         FROM kylin_banners
         <where>
             is_deleted = 1
-            <if test="name != ''">
-                AND name LIKE concat('%', #{name}, '%')
+            <if test="bannersName != ''">
+                AND banners_name LIKE concat('%', #{bannersName}, '%')
             </if>
-            <if test="type != ''">
-                AND type=#{type}
+            <if test="targetType != ''">
+                AND target_type=#{targetType}
             </if>
-            <if test="isShow != ''">
-                AND is_show=#{isShow}
+            <if test="isOnline != ''">
+                AND is_online=#{isOnline}
             </if>
-            <if test="position != ''">
-                AND position=#{position}
+            <if test="promotionType != ''">
+                AND promotion_type=#{promotionType}
             </if>
         </where>
-        ORDER BY sort DESC
+        ORDER BY banners_sort DESC
         LIMIT #{page},#{size}
     </select>
 
@@ -54,17 +56,17 @@
         FROM kylin_banners
         <where>
             is_deleted = 1
-            <if test="name != ''">
-                AND name LIKE concat('%', #{name}, '%')
+            <if test="bannersName != ''">
+                AND banners_name LIKE concat('%', #{bannersName}, '%')
             </if>
-            <if test="type != ''">
-                AND type=#{type}
+            <if test="targetType != ''">
+                AND target_type=#{targetType}
             </if>
-            <if test="isShow != ''">
-                AND is_show=#{isShow}
+            <if test="isOnline != ''">
+                AND is_online=#{isOnline}
             </if>
-            <if test="position != ''">
-                AND position=#{position}
+            <if test="promotionType != ''">
+                AND promotion_type=#{promotionType}
             </if>
         </where>
     </select>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinBannersRelationsMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinBannersRelationsMapper">
     <!-- getBannersRelationsId -->
-    <select id="getBannersRelationsId" parameterType="java.util.Map" resultType="string">
-        SELECT banners_relations_id
+    <select id="getBannersRelationsField" parameterType="java.util.Map" resultType="string">
+        SELECT ${field}
         FROM kylin_banners_relations
         <where>
             <if test="bannersId != ''">

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinBannersAdminController.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @since 2021-05-01
  */
 
-@Api
+@Api(tags = "后端-banner")
 @RestController
 @RequestMapping("admin/banners")
 public class KylinBannersAdminController {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinBannersServiceImpl.java

@@ -72,8 +72,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             bannersMapper.insert(bannersParam.getFields(bannersId, createdAtString));
 
             List<String> positionList = bannersParam.getPositionList();
+            KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
             for (String fieldId : positionList) {
-                KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
                 KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 1, createdAtString);
                 kylinBannersRelationsMapper.insert(relations);
 
@@ -83,7 +83,6 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             List<String> provincesList = bannersParam.getProvincesList();
             if (!provincesList.isEmpty()) {
                 for (String fieldId : provincesList) {
-                    KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
                     KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 2, createdAtString);
                     kylinBannersRelationsMapper.insert(relations);
 
@@ -140,7 +139,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             List<String> positionList = bannersParam.getPositionList();
             // 删除之前的再添加
-            List<String> relationsIds = kylinBannersRelationsMapper.getBannersRelationsId(bannersId, 1);
+            List<String> relationsIds = kylinBannersRelationsMapper.getBannersRelationsField("banners_relations_id",bannersId, 1);
             kylinBannersRelationsMapper.delete(
                     new UpdateWrapper<KylinBannersRelations>().eq("banners_id", bannersId).eq("field_id_type", 1)
             );
@@ -151,8 +150,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             for (String relationsId : relationsIds) {
                 redisUtil.hdel(KylinRedisConst.BANNERSRELATIONS, relationsId);
             }
+            KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
             for (String fieldId : positionList) {
-                KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
                 KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 1, updatedAtString);
                 kylinBannersRelationsMapper.insert(relations);
 
@@ -162,7 +161,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             List<String> provincesList = bannersParam.getProvincesList();
             if (!provincesList.isEmpty()) {
                 // 删除之前的再添加
-                List<String> relationsIdss = kylinBannersRelationsMapper.getBannersRelationsId(bannersId, 2);
+                List<String> relationsIdss = kylinBannersRelationsMapper.getBannersRelationsField("banners_relations_id",bannersId, 2);
                 kylinBannersRelationsMapper.delete(
                         new UpdateWrapper<KylinBannersRelations>().eq("banners_id", bannersId).eq("field_id_type", 2)
                 );
@@ -174,7 +173,6 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
                     redisUtil.hdel(KylinRedisConst.BANNERSRELATIONS, relationsId);
                 }
                 for (String fieldId : provincesList) {
-                    KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
                     KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 2, updatedAtString);
                     kylinBannersRelationsMapper.insert(relations);
 
@@ -205,7 +203,13 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
     }
 
     public KylinBanners detail(String bannersId) {
-        KylinBanners data = bannersMapper.selectById(bannersId);
+        KylinBanners data = bannersMapper.selectOne(new UpdateWrapper<KylinBanners>().eq("banners_id", bannersId).eq("is_deleted", 1));
+        List<String> positionList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 1);
+        List<String> provincesList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 2);
+
+        data.setPositionList(positionList);
+        data.setProvincesList(provincesList);
+
         return data;
     }
 
@@ -216,6 +220,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             List<BannerDetailsListDao> data = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam));
             return data;
         } catch (Exception e) {
+            System.out.println(e.getMessage());
             return new ArrayList<>();
         }
     }