banners 删除接口 + 严重参数（但是无效果）

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.*;
 import java.io.Serializable;
 
 
@@ -21,21 +22,27 @@ public class BannersVo implements Serializable {
     private String bannersId;
 
     @ApiModelProperty(value = "标题")
+    @NotBlank(message = "请填写标题")
     private String name;
 
     @ApiModelProperty(value = "封面图")
+    @NotBlank(message = "请上传封面图")
     private String coverImg;
 
     @ApiModelProperty(value = "跳转目标id或者url")
+    @NotBlank(message = "请填写需要跳转的目标id或urk")
     private String targetId;
 
     @ApiModelProperty(value = "跳转类型 6演出跳转 7商品跳转 8巡演跳转 12展示分享按钮的web连接 14积分商品详情 100活动跳转 999不跳转 998个人信息跳转")
+    @Min(value = 1, message = "请选择跳转类型")
     private Integer type;
 
     @ApiModelProperty(value = "是否显示 0-否,1-是")
+    @Min(value = 1, message = "请选择是否显示")
     private Integer isShow;
 
     @ApiModelProperty(value = "展示位置")
+    @Min(value = 1, message = "请选择展示的位置")
     private Integer position;
 
     @ApiModelProperty(value = "排序权重 越大越靠前")
@@ -44,6 +51,9 @@ public class BannersVo implements Serializable {
     @ApiModelProperty(value = "备注")
     private String comment;
 
+    @ApiModelProperty(value = "是否删除 0已删除,1正常")
+    private Integer isDeleted;
+
     @ApiModelProperty(value = "创建时间")
     private String  createdAt;
 

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

@@ -69,6 +69,11 @@ public class KylinBanners implements Serializable {
      */
     private String comment;
 
+    /**
+     * 是否删除 1正常 已删除
+     */
+    private Integer isDeleted;
+
     /**
      * 创建时间
      */

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

@@ -20,18 +20,17 @@
         *
         FROM kylin_banners
         <where>
-            1 = 1
             banners_id=#{bannersId}
         </where>
     </select>
 
-    <!-- mis场地列表 -->
+    <!-- admin banner列表 -->
     <select id="searchBannersList" parameterType="java.util.Map" resultMap="bannerDetailsResult">
         SELECT
         *
         FROM kylin_banners
         <where>
-            1 = 1
+            is_deleted = 1
             <if test="name != ''">
                 AND name LIKE concat('%', #{name}, '%')
             </if>
@@ -49,12 +48,12 @@
         LIMIT #{page},#{size}
     </select>
 
-    <!-- mis场地列表数量 -->
+    <!-- admin banner列表数量 -->
     <select id="searchBannersCount" parameterType="java.util.Map" resultType="long">
         SELECT COUNT(0)
         FROM kylin_banners
         <where>
-            1 = 1
+            is_deleted = 1
             <if test="name != ''">
                 AND name LIKE concat('%', #{name}, '%')
             </if>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -18,6 +18,7 @@ CREATE TABLE `kylin_banners`
     `position`   int(11)      NOT NULL DEFAULT 0 COMMENT '展示位置',
     `sort`       int(11)      NOT NULL DEFAULT 0 COMMENT '排序权重',
     `comment`    varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
+    `is_deleted` tinyint      NOT NULL DEFAULT 1 COMMENT '是否删除 1正常 0已删除',
     `created_at` datetime     NULL     DEFAULT NULL COMMENT '创建时间',
     `updated_at` datetime     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_banners_uid_index` (`banners_id`),

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public class KylinBannersAdminController {
 
     @PostMapping("")
     @ApiOperation(value = "创建banner")
-    public ResponseDto<Object> create(@RequestBody BannersParam bannersParam) {
+    public ResponseDto<Object> create(@RequestBody @Validated BannersParam bannersParam) {
         Boolean res = kylinBannersServiceImpl.create(bannersParam);
         if (res) {
             return ResponseDto.success();
@@ -83,4 +84,15 @@ public class KylinBannersAdminController {
         }
     }
 
+    @DeleteMapping("{bannersId}")
+    @ApiOperation(value = "删除banner")
+    public ResponseDto<Object> deleteTimes(@PathVariable("bannersId") String bannersId) {
+        boolean result = kylinBannersServiceImpl.delete(bannersId);
+        if (result) {
+            return ResponseDto.success("删除成功");
+        } else {
+            return ResponseDto.failure("删除失败");
+        }
+    }
+
 }

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

@@ -19,10 +19,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mysql.cj.util.StringUtils;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -49,6 +52,9 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
     @Autowired
     MongoTemplate mongoTemplate;
 
+    @Autowired
+    private MongoConverter mongoConverter;
+
     @Autowired
     RedisUtil redisUtil;
 
@@ -63,6 +69,13 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             bannersVo.setBannersId(bannersId);
             bannersVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             bannersVo.setUpdatedAt("");
+            bannersVo.setIsDeleted(1);
+            if (null == bannersParam.getSort()) {
+                bannersVo.setSort(0);
+            }
+            if (StringUtils.isNullOrEmpty(bannersParam.getComment())) {
+                bannersVo.setComment("");
+            }
             mongoTemplate.insert(bannersVo, BannersVo.class.getSimpleName());
 
             redisUtil.hset(KylinRedisConst.BANNERS, bannersId, bannersVo);
@@ -126,4 +139,35 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
     }
 
+    public Boolean delete(String bannersId) {
+        try {
+            LocalDateTime updatedAt = LocalDateTime.now();
+
+            KylinBanners kylinBanners = new KylinBanners();
+            kylinBanners.setUpdatedAt(updatedAt);
+            kylinBanners.setIsDeleted(0);
+            bannersMapper.update(kylinBanners
+                    , new UpdateWrapper<KylinBanners>().eq("banners_id", bannersId));
+
+            // mongo 操作
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            map.put("isDeleted", 0);
+
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+            Document doc = mongoTemplate.getCollection(BannersVo.class.getSimpleName()).findOneAndUpdate(
+                    Query.query(Criteria.where("bannersId").is(bannersId)).getQueryObject(),
+                    object,
+                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+            );
+
+            // redis 操作
+            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), BannersVo.class));
+
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
 }