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/BannersParam.java

@@ -17,7 +17,6 @@ import java.time.LocalDateTime;
  * @since 2021-05-03 11:19 上午
  */
 
-
 @Data
 public class BannersParam implements Serializable {
     @ApiModelProperty(value = "Banner主键ID", example = "4345ASGMTG66")

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

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 轮播图 banner 搜索 需要的参数
+ * </p>
+ * @author jiangxiulong
+ * @since 2021-05-03 11:19 上午
+ */
+
+@Data
+public class BannersSearchParam implements Serializable {
+    @ApiModelProperty(value = "标题", example = "这是一个banner标题")
+    private String name;
+
+    @ApiModelProperty(value = "跳转类型 6演出跳转 7商品跳转 8巡演跳转 12展示分享按钮的web连接 14积分商品详情 100活动跳转 999不跳转 998个人信息跳转", example = "6")
+    private Integer type;
+
+    @ApiModelProperty(value = "是否显示 0-否,1-是", example = "1", allowableValues = "0,1")
+    private Integer isShow;
+
+    @ApiModelProperty(value = "展示位置", example = "1")
+    private Integer position;
+
+    @ApiModelProperty(value = "页数 ", example = "1")
+    private int page;
+
+    @ApiModelProperty(value = "数量 ", example = "10")
+    private int size;
+}

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 lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BannerDetailsListDao implements Serializable {
+
+    private String bannersId;
+
+    private String name;
+
+    private String coverImg;
+
+    private String targetId;
+
+    private Integer type;
+
+    private Integer isShow;
+
+    private Integer position;
+
+    private Integer sort;
+
+    private String comment;
+}

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

 package com.liquidnet.service.kylin.mapper;
 
 import com.liquidnet.service.kylin.dao.BannerDetailsDao;
+import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 轮播图 Mapper 接口 处理数据库
@@ -15,4 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface KylinBannersMapper extends BaseMapper<KylinBanners> {
     // 详情
     BannerDetailsDao detail(String bannersId);
+    //列表
+    List<BannerDetailsListDao> searchBannersList(Map<String,Object> map);
+    //分页数量
+    long searchBannersCount(Map<String,Object> map);
 }

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

@@ -2,7 +2,7 @@
 <!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.KylinBannersMapper">
     <!-- 详情 -->
-    <resultMap id="BannerDetailsDao" type="com.liquidnet.service.kylin.dao.BannerDetailsDao">
+    <resultMap id="bannerDetailsResult" type="com.liquidnet.service.kylin.dao.BannerDetailsDao">
         <result column="banners_id" property="bannersId"/>
         <result column="name" property="name"/>
         <result column="cover_img" property="coverImg"/>
@@ -15,13 +15,59 @@
         <result column="created_at" property="createdAt"/>
         <result column="updated_at" property="updatedAt"/>
     </resultMap>
-    <select id="detail" parameterType="java.lang.String" resultMap="BannerDetailsDao">
+    <select id="detail" parameterType="java.lang.String" resultMap="bannerDetailsResult">
         SELECT
         *
         FROM kylin_banners
         <where>
+            1 = 1
             banners_id=#{bannersId}
         </where>
     </select>
 
+    <!-- mis场地列表 -->
+    <select id="searchBannersList" parameterType="java.util.Map" resultMap="bannerDetailsResult">
+        SELECT
+        *
+        FROM kylin_banners
+        <where>
+            1 = 1
+            <if test="name != ''">
+                AND name LIKE concat('%', #{name}, '%')
+            </if>
+            <if test="type != ''">
+                AND type=#{type}
+            </if>
+            <if test="isShow != ''">
+                AND is_show=#{isShow}
+            </if>
+            <if test="position != ''">
+                AND position=#{position}
+            </if>
+        </where>
+        ORDER BY sort DESC
+        LIMIT #{page},#{size}
+    </select>
+
+    <!-- mis场地列表数量 -->
+    <select id="searchBannersCount" parameterType="java.util.Map" resultType="long">
+        SELECT COUNT(0)
+        FROM kylin_banners
+        <where>
+            1 = 1
+            <if test="name != ''">
+                AND name LIKE concat('%', #{name}, '%')
+            </if>
+            <if test="type != ''">
+                AND type=#{type}
+            </if>
+            <if test="isShow != ''">
+                AND is_show=#{isShow}
+            </if>
+            <if test="position != ''">
+                AND position=#{position}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -3,13 +3,18 @@ package com.liquidnet.service.kylin.controller.admin;
 
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.kylin.dao.BannerDetailsDao;
+import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
+import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
+import com.liquidnet.service.kylin.dto.vo.PagerVo;
 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.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 轮播图 后端管理控制器
@@ -61,4 +66,21 @@ public class KylinBannersAdminController {
         }
     }
 
+    @PostMapping("list")
+    @ApiOperation(value = "banner列表")
+    public ResponseDto<PagerVo<BannerDetailsListDao>> bannerList(@RequestBody BannersSearchParam bannersSearchParam) {
+        List<BannerDetailsListDao> result = kylinBannersServiceImpl.bannerList(bannersSearchParam);
+        Long total = kylinBannersServiceImpl.bannerListCount(bannersSearchParam);
+
+        PagerVo<BannerDetailsListDao> pagerVo = new PagerVo();
+        pagerVo.setRows(result);
+        pagerVo.setTotal(total);
+
+        if (pagerVo.getRows().size() > 0) {
+            return ResponseDto.success(pagerVo);
+        } 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

@@ -3,12 +3,14 @@ package com.liquidnet.service.kylin.service.impl.admin;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.BeanUtil;
 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.BannerDetailsDao;
-import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
+import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
+import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
 import com.liquidnet.service.kylin.dto.vo.BannersVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
@@ -27,6 +29,8 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -103,4 +107,23 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         return data;
     }
 
+    public List<BannerDetailsListDao> bannerList(BannersSearchParam bannersSearchParam) {
+        try {
+            bannersSearchParam.setPage((bannersSearchParam.getPage() - 1) * bannersSearchParam.getSize());
+
+            List<BannerDetailsListDao> data = bannersMapper.searchBannersList(BeanUtil.convertBeanToMap(bannersSearchParam));
+            return data;
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+    public Long bannerListCount(BannersSearchParam bannersSearchParam) {
+        try {
+            Long count = bannersMapper.searchBannersCount(BeanUtil.convertBeanToMap(bannersSearchParam));
+            return count;
+        } catch (Exception e) {
+            return 0L;
+        }
+    }
+
 }

pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.liquidnet</groupId>
-    <artifactId>liquidnet-bus-v1</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <description>allpom</description>
-
-    <modules>
-        <module>liquidnet-bus-client</module>
-        <module>liquidnet-bus-common</module>
-        <module>liquidnet-bus-service</module>
-        <module>liquidnet-bus-support</module>
-    </modules>
-
-</project>