From 23dea9cf5cb0148fb950e770a3ec25e1a951fb04 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Thu, 5 Aug 2021 09:08:59 +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

---
 .../BizMessageConsumerController.java         | 14 +++++++++++++
 .../bizmessage/dao/BizMessageMapper.java      |  5 +++++
 .../dao/mapper/BizMessageMapper.xml           | 21 +++++++++++++++++++
 .../service/BizMessageConsumerService.java    |  5 +++++
 .../impl/BizMessageConsumerServiceImpl.java   | 12 +++++++++++
 5 files changed, 57 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java
index 46029ca..84e2830 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java
@@ -1,6 +1,7 @@
 package com.chinaunicom.mall.ebtp.extend.bizmessage.controller;
 
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -63,4 +65,16 @@ public class BizMessageConsumerController {
         }).orElseGet(DescribeSiteMsgDetailVO::new);
     }
 
+    /**
+     * 信息类别查询
+     *
+     * @return
+     */
+    @ApiOperation("信息类别查询")
+    @PostMapping("selectMsgListByType")
+    @ResponseStatus(code = HttpStatus.OK)
+    public List<BizMessageVo> selectMsgListByType(@RequestBody(required = false) BizMessageVo vo) {
+
+        return service.selectMsgListByType(vo);
+    }
 }
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 42dc549..0b0fba2 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
@@ -6,6 +6,8 @@ import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface BizMessageMapper extends BaseMapper<BizMessage> {
 
     IPage<BizMessage> findMessage(@Param("param") IPage<BizMessage> page, @Param("userId") String userId);
@@ -13,4 +15,7 @@ public interface BizMessageMapper extends BaseMapper<BizMessage> {
     IPage<BizMessageVo> findMessageVo(@Param("param") IPage<BizMessageVo> page, @Param("userId") String userId);
 
     Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId);
+
+    List<BizMessageVo> findMessageVoList(BizMessageVo vo,@Param("userId") String userId);
+
 }
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 a83dc75..80092fe 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
@@ -42,4 +42,25 @@
         and user_id =#{userId}
     </update>
 
+    <select id="findMessageVoList" resultType="com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo">
+
+        SELECT
+        biz_message.*,
+        biz_message_authorize.state as authorizestate,
+        biz_message_template.type AS templatetype
+        FROM
+        biz_message
+        LEFT JOIN biz_message_template ON biz_message.templatecode = biz_message_template.CODE
+        inner join biz_message_authorize on biz_message.id = biz_message_authorize.message_id
+        WHERE
+        authorize = 1 and user_id = #{userId}
+        <if test="authorizestate!=null and authorizestate!=''">
+            and biz_message_authorize.state = #{authorizestate}
+        </if>
+        <if test="templatetype!=null and templatetype!=''">
+            and biz_message_template.type = #{templatetype}
+        </if>
+        ORDER BY createtime DESC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java
index 56a61ad..2fb4082 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java
@@ -2,9 +2,12 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service;
 
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO;
 
+import java.util.List;
+
 public interface BizMessageConsumerService {
 
     IBizMessagePage<DescribeSiteMsgVO> listOutline(PageDTO page);
@@ -12,4 +15,6 @@ public interface BizMessageConsumerService {
     BizMessage getDetailById(String id);
 
     Boolean updateState(String id);
+
+    List<BizMessageVo> selectMsgListByType(BizMessageVo vo);
 }
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 0d1ca82..69b6df7 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
@@ -97,4 +97,16 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
         }).orElseGet(PageDTO::new);
     }
 
+    /**
+     * 消息概要列表
+     *
+     * @return
+     */
+    @Override
+    public List<BizMessageVo> selectMsgListByType(BizMessageVo vo) {
+
+        List<BizMessageVo> list = mapper.findMessageVoList(vo,service.getCacheUser().getUserId());
+
+        return list;
+    }
 }