From fa2df9fcf39240c6351788e43d60e14ac0322938 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Tue, 10 Aug 2021 08:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/bizmessage/dao/BizMessageMapper.java     |  2 +-
 .../bizmessage/dao/mapper/BizMessageMapper.xml      |  8 ++++----
 .../ebtp/extend/bizmessage/entity/BizMessageVo.java |  3 ++-
 .../service/impl/BizMessageConsumerServiceImpl.java | 13 +++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java
index 677fb87..ab19cc6 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java
@@ -16,6 +16,6 @@ public interface BizMessageMapper extends BaseMapper<BizMessage> {
 
     Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId);
 
-    List<BizMessageVo> findMessageVoList(BizMessageVo vo);
+    IPage<BizMessageVo> findMessageVoList(@Param("param") IPage<BizMessageVo> page,BizMessageVo vo);
 
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
index da79a91..99b262e 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
@@ -19,13 +19,13 @@
     </select>
 
     <select id="findMessageVo" resultType="com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo">
-        SELECT biz_message.*,biz_message_template.type as templatetype,'1' as authorizestate,count(a.*) as datanum
+        SELECT biz_message.*,biz_message_template.type as templatetype,'1' as authorizestate
         FROM biz_message
         left join biz_message_template on biz_message.templatecode = biz_message_template.code
         WHERE authorize = 0
         <if test="userId!=null and userId!=''">
             UNION ALL
-            SELECT a.*,IFNULL(b.state,1) as authorizestate,count(a.*) as datanum
+            SELECT a.*,IFNULL(b.state,1) as authorizestate
             FROM ( SELECT biz_message.*,biz_message_template.type as templatetype
             FROM biz_message
             left join biz_message_template on biz_message.templatecode = biz_message_template.code
@@ -47,8 +47,7 @@
         SELECT
         biz_message.*,
         biz_message_authorize.state as authorizestate,
-        biz_message_template.type AS templatetype,
-        count(biz_message.*) as datanum
+        biz_message_template.type AS templatetype
         FROM
         biz_message
         LEFT JOIN biz_message_template ON biz_message.templatecode = biz_message_template.CODE
@@ -62,6 +61,7 @@
             and biz_message_template.type = #{templatetype}
         </if>
         ORDER BY createtime DESC
+        LIMIT #{size}
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
index e63151b..b15db1b 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
@@ -8,6 +8,7 @@ public class BizMessageVo extends BizMessage{
     private String authorizestate;
     private String templatetype;
     private String userId;
-    private Integer datanum;
+    private Long datanum;
+    private Integer size;
 
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
index b415eda..10b0df8 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
@@ -104,12 +104,21 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
      */
     @Override
     public List<BizMessageVo> selectMsgListByType(BizMessageVo vo) {
-
+        vo.setSize(vo.getSize()!=null?vo.getSize():5);
         vo.setUserId(service.getCacheUser().getUserId());
         if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){
             vo.setAuthorizestate("0");
         }
-        List<BizMessageVo> list = mapper.findMessageVoList(vo);
+        PageDTO page = new PageDTO();
+        page.setPageSize(vo.getSize());
+
+        IPage<BizMessageVo> pageEntity = mapper.findMessageVoList(new Page<BizMessageVo>(page.getPageNo(), page.getPageSize()),vo);
+
+        List<BizMessageVo> list = pageEntity.getRecords();
+
+        list.forEach(l->{
+            l.setDatanum(pageEntity.getCurrent());
+        });
 
         return list;
     }