Merge remote-tracking branch 'origin/dev' into dev

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

-package com.liquidnet.service.kylin.dto.param;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 轮播图 banner 搜索 需要的参数 前端api
- * </p>
- * @author jiangxiulong
- * @since 2021-05-10 11:19 上午
- */
-
-@Data
-public class BannersApiSearchParam implements Serializable {
-
-    @ApiModelProperty(value = "展示的位置", example = "11")
-    private String position;
-
-    @ApiModelProperty(value = "当前用户省份code", example = "4")
-    private String provinceCode;
-
-}

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

@@ -60,11 +60,11 @@ public class BannersParam implements Serializable {
     @ApiModelProperty(value = "备注", example = "这是一个演出推广的banner")
     private String remarks;
 
-    @ApiModelProperty(value = "展示的位置 多选 数组", example = "[\"1\", \"4\", \"3\"]")
+    @ApiModelProperty(value = "展示的位置 多选 数组", example = "[\"1\", \"4\", \"3\", \"5\", \"6\", \"8\"]")
     @NotEmpty(message = "请选择展示位置")
     private List positionList;
 
-    @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"1\", \"4\", \"3\"]")
+    @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"1\", \"2\", \"5\"]")
 //    @NotEmpty(message = "请选择推广省份")
     private List provincesList;
 

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.kylin.controller;
 
 
 import com.liquidnet.service.ResponseDto;
-import com.liquidnet.service.kylin.dto.param.BannersApiSearchParam;
 import com.liquidnet.service.kylin.dto.vo.BannersVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
 import io.swagger.annotations.Api;
@@ -12,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,23 +34,17 @@ public class KylinBannersController {
     @GetMapping("")
     @ApiOperation("banner列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "String", name = "position", value = "展示位置 1首页 3周边 4演出 5积分商城 6YB 8视频",required = true),
-            @ApiImplicitParam(type = "form", dataType = "String", name = "provinceCode", value = "城市code"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 4演出 5积分商城 6YB 8视频", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "provinceCode", value = "城市code"),
     })
     public ResponseDto<List<BannersVo>> blist(
-            @RequestParam String position,
-            @RequestParam String provinceCode
+            @RequestParam() String position,
+            @RequestParam(defaultValue = "") String provinceCode
     ) {
-        BannersApiSearchParam bannersApiSearchParam = new BannersApiSearchParam();
-        bannersApiSearchParam.setPosition(position);
-        bannersApiSearchParam.setProvinceCode(provinceCode);
-        List result = kylinBannersServiceImpl.blist(bannersApiSearchParam);
-
-        if (result.size() > 0) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure("获取列表失败");
-        }
+        List result = new ArrayList();
+        result = kylinBannersServiceImpl.blist(position, provinceCode);
+
+        return ResponseDto.success(result);
     }
 
 }

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

@@ -8,7 +8,6 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
-import com.liquidnet.service.kylin.dto.param.BannersApiSearchParam;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
 import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
 import com.liquidnet.service.kylin.dto.vo.BannersVo;
@@ -246,7 +245,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
     }
 
-    public List blist(BannersApiSearchParam bannersApiSearchParam) {
+    public List blist(String position, String provinceCode) {
         Query query = new Query();
         query.addCriteria(
                 Criteria.where("isOnline").is(1).and("isDeleted").is(1)
@@ -261,15 +260,15 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         Criteria mergeCriteriaTime = new Criteria();
         mergeCriteriaTime.orOperator(onlineTimeBetween, onlineTimeGt, onlineTimeLt, onlineTimeEmpty);
 
-        if (!bannersApiSearchParam.getPosition().isEmpty()) {
+        if (!position.isEmpty()) {
             query.addCriteria(
-                    Criteria.where("positionList").in(bannersApiSearchParam.getPosition())
+                    Criteria.where("positionList").in(position)
             );
         }
 
         Criteria mergeCriteriaPromotion = new Criteria();
-        if (!bannersApiSearchParam.getProvinceCode().isEmpty()) {
-            Criteria promotionCity = Criteria.where("provincesList").in(bannersApiSearchParam.getProvinceCode());
+        if (!provinceCode.isEmpty()) {
+            Criteria promotionCity = Criteria.where("provincesList").in(provinceCode);
             Criteria promotionAll = Criteria.where("promotionType").is(1);
             mergeCriteriaPromotion.orOperator(promotionCity, promotionAll);
         }