Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoRedDotResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.dto.message.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,10 +18,10 @@ public class InfoRedDotResultDTO implements Serializable {
     /**
      * 我发出的，新回复数量
      */
-    private Integer sentNewReplyCount;
+    private Integer sentNewReplyCount = NumConstant.ZERO;
 
     /**
      * 我收到的未读的消息数量
      */
-    private Integer receivedUnReadCount;
+    private Integer receivedUnReadCount = NumConstant.ZERO;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetmessage/InfoReceiversDao.java

@@ -90,4 +90,20 @@ public interface InfoReceiversDao extends BaseDao<InfoReceiversEntity> {
      * @date 2021/8/20 2:31 下午
      */
     List<FileCommonDTO> selectReplyAtt(String replyId);
+
+    /**
+     * @Description  查询我收到的未读的消息数量
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/20 4:16 下午
+     */
+    Integer selectUnReadCount(@Param("userId") String userId);
+
+    /**
+     * @Description  我发出的，新回复数量
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/20 4:20 下午
+     */
+    Integer selectNewReplyCount(@Param("userId") String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java

@@ -187,7 +187,10 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
      */
     @Override
     public InfoRedDotResultDTO redDot(String userId) {
-        return null;
+        InfoRedDotResultDTO result = new InfoRedDotResultDTO();
+        result.setReceivedUnReadCount(infoReceiversDao.selectUnReadCount(userId));
+        result.setSentNewReplyCount(infoReceiversDao.selectNewReplyCount(userId));
+        return result;
     }
 
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml

@@ -104,4 +104,25 @@
         ORDER BY
             m.SORT ASC
     </select>
+
+    <!-- 查询我收到的未读的消息数量	 -->
+    <select id="selectUnReadCount" resultType="java.lang.Integer">
+        SELECT
+            IFNULL(COUNT(INFO_ID),0)
+        FROM info_receivers
+        WHERE
+            DEL_FLAG = '0'
+          AND STAFF_ID = #{userId}
+          AND READ_FLAG = 0
+    </select>
+
+    <!-- 我发出的，新回复数量 -->
+    <select id="selectNewReplyCount" resultType="java.lang.Integer">
+        SELECT
+            IFNULL(SUM(UN_READ_REPLY_NUM) ,0)
+        FROM info_profile
+        WHERE
+            DEL_FLAG = '0'
+          AND CREATED_BY = #{userId}
+    </select>
 </mapper>