增加数据类别字段

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java

@@ -3,10 +3,13 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo;
 import org.apache.ibatis.annotations.Param;
 
 public interface BizMessageMapper extends BaseMapper<BizMessage> {
 
     IPage<BizMessage> findMessage(@Param("param") IPage<BizMessage> page, @Param("userId") String userId);
 
+    IPage<BizMessageVo> findMessageVo(@Param("param") IPage<BizMessageVo> page, @Param("userId") String userId);
+
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml

@@ -3,17 +3,14 @@
 <mapper namespace="com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper">
 
     <select id="findMessage" resultType="com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage">
-        SELECT biz_message.*,biz_message_template.type as templatetype
+        SELECT biz_message.*
-        FROM biz_message
+        FROM biz_message WHERE authorize = 0
-        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.*
-            FROM ( SELECT biz_message.*,biz_message_template.type templatetype FROM biz_message
+            FROM ( SELECT biz_message.* FROM biz_message
-            left join biz_message_template on biz_message.templatecode = biz_message_template.code
              WHERE authorize = 1) a
             INNER JOIN
             ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id
@@ -21,4 +18,23 @@
         ORDER BY createtime DESC
     </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
+        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
+            FROM ( SELECT biz_message.*,biz_message_template.type templatetype
+            FROM biz_message
+            left join biz_message_template on biz_message.templatecode = biz_message_template.code
+            WHERE authorize = 1) a
+            INNER JOIN
+            ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id
+        </if>
+        ORDER BY createtime DESC
+    </select>
 </mapper>

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessage.java

@@ -18,8 +18,6 @@ public class BizMessage {
     private String params;
     private Timestamp createtime;
     private String templatecode;
-    @TableField(exist = false)
-    private String templatetype;
 
     /* 该值为1则标识开启授权控制，只有授权列表( biz_message_authorize )内的用户可见 */
     private Integer authorize;

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageAuthorize.java

@@ -11,5 +11,6 @@ public class BizMessageAuthorize {
 
     private String userId;
     private String messageId;
+    private String state;
 
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java

@@ -0,0 +1,11 @@
+package com.chinaunicom.mall.ebtp.extend.bizmessage.entity;
+
+import lombok.Data;
+
+@Data
+public class BizMessageVo extends BizMessage{
+
+    private String templatetype;
+    private String authorizestate;
+
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java

@@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper;
 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.BizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService;
@@ -14,6 +15,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -39,7 +41,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
     public IBizMessagePage<DescribeSiteMsgVO> listOutline(PageDTO page) {
         page = createPageCondition(page);
 
-        IPage<BizMessage> pageEntity = mapper.findMessage(new Page<BizMessage>(page.getPageNo(), page.getPageSize()),
+        IPage<BizMessageVo> pageEntity = mapper.findMessageVo(new Page<BizMessageVo>(page.getPageNo(), page.getPageSize()),
                 service.getCacheUser().getUserId());
 
         // DAT -> VO 转换
@@ -49,8 +51,8 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
             DescribeSiteMsgVO vo = new DescribeSiteMsgVO();
             vo.setMsgId(source.getId());
             vo.setTemplatetype(source.getTemplatetype());
+            vo.setAuthorizestate(source.getAuthorizestate());
             BeanUtils.copyProperties(source, vo);
-
             return vo;
         }).collect(Collectors.toList()));
 

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgVO.java

@@ -17,6 +17,7 @@ public class DescribeSiteMsgVO {
     private String title;
     private String category;
     private String templatetype;
+    private String authorizestate;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp createtime;