Merge remote-tracking branch 'origin/group5-notice'

kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java

@@ -121,4 +121,25 @@ public interface MessageApi {
      */
     List<MessageResponse> queryListCurrentUser(MessageParam messageParam);
 
+    /**
+     * 查询系统消息数量
+     *
+     * @param messageParam 查询参数
+     * @return 系统消息数量
+     * @author liuhanqing
+     * @date 2021/1/11 21:21
+     */
+    Integer queryCount(MessageParam messageParam);
+
+    /**
+     * 查询系统消息数量，当前登录用户
+     *
+     * @param messageParam 查询参数
+     * @return 系统消息数量
+     * @author liuhanqing
+     * @date 2021/1/11 21:21
+     */
+    Integer queryCountCurrentUser(MessageParam messageParam);
+
+
 }

kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java

@@ -1,9 +1,13 @@
 package cn.stylefeng.roses.kernel.message.api.pojo;
 
+import cn.stylefeng.roses.kernel.message.api.enums.MessageProrityLevelEnum;
+import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 系统消息的查询参数
@@ -69,4 +73,29 @@ public class MessageResponse implements Serializable {
      */
     private Integer readFlag;
 
+    /**
+     * 消息优先级
+     */
+    private String priorityLevelValue;
+
+    /**
+     * 阅读状态：0-未读，1-已读
+     */
+    private String readFlagValue;
+
+    public String getPriorityLevelValue(){
+        AtomicReference<String> value = new AtomicReference<>("");
+        Optional.ofNullable(this.priorityLevel).ifPresent(val ->{
+            value.set(MessageProrityLevelEnum.getName(this.priorityLevel));
+        });
+        return value.get();
+    }
+
+    public String getReadFlagValue(){
+        AtomicReference<String> value = new AtomicReference<>("");
+        Optional.ofNullable(this.readFlag).ifPresent(val ->{
+            value.set(MessageReadFlagEnum.getName(this.readFlag));
+        });
+        return value.get();
+    }
 }

kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java

@@ -15,7 +15,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 系统消息控制器
@@ -117,4 +119,20 @@ public class SysMessageController {
         return new SuccessResponseData(messageApi.queryListCurrentUser(messageParam));
     }
 
+
+    /**
+     * 系统消息未读数量
+     *
+     * @author liuhanqing
+     * @date 2021/1/11 19:50
+     */
+    @GetResource(name = "系统消息列表", path = "/sysMessage/unReadCount")
+    public ResponseData msgUnRead(MessageParam messageParam) {
+        messageParam.setReadFlag(MessageReadFlagEnum.UNREAD.getCode());
+        Integer messageCount = messageApi.queryCountCurrentUser(messageParam);
+        Map<String, Object> msgMap = new HashMap<>(1);
+        msgMap.put("msgUnReadCount", messageCount);
+        return new SuccessResponseData(messageApi.queryListCurrentUser(messageParam));
+    }
+
 }

kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java

@@ -194,4 +194,19 @@ public class MessageDbServiceImpl implements MessageApi {
         messageParam.setReceiveUserId(loginUser.getUserId());
         return this.queryList(messageParam);
     }
+
+    @Override
+    public Integer queryCount(MessageParam messageParam) {
+        return sysMessageService.count(messageParam);
+    }
+    @Override
+    public Integer queryCountCurrentUser(MessageParam messageParam) {
+        if (ObjectUtil.isEmpty(messageParam)) {
+            messageParam = new MessageParam();
+        }
+        // 获取当前登录人
+        LoginUser loginUser = LoginContext.me().getLoginUser();
+        messageParam.setReceiveUserId(loginUser.getUserId());
+        return this.queryCount(messageParam);
+    }
 }

kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java

@@ -31,4 +31,13 @@ public interface SysMessageService extends IService<SysMessage> {
      * @date 2021/1/8 15:21
      */
     List<SysMessage> list(MessageParam messageParam);
+
+    /**
+     * 数量查询
+     *
+     * @param messageParam 参数
+     * @author liuhanqing
+     * @date 2021/1/11 19:21
+     */
+    Integer count(MessageParam messageParam);
 }

kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java

@@ -38,6 +38,12 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
         LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageParam);
         return this.list(wrapper);
     }
+    @Override
+    public Integer count(MessageParam messageParam) {
+        LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageParam);
+        return this.count(wrapper);
+    }
+
     /**
      * 创建wrapper
      *

kernel-s-system/system-business-notice/pom.xml

@@ -53,11 +53,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <!--消息模块-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>message-api</artifactId>
+            <artifactId>message-spring-boot-starter</artifactId>
             <version>1.0.0</version>
-            <scope>compile</scope>
         </dependency>
 
     </dependencies>