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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @Description
  * @Author sun
  */
-@FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory = CommonAggFeignClientFallBackFactory.class,url = "http://localhost:8114")
+@FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory = CommonAggFeignClientFallBackFactory.class)
 public interface CommonAggFeignClient {
 
     /**

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

@@ -0,0 +1,26 @@
+package com.epmet.dataaggre.dto.message.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/20 3:22 下午
+ * @DESC
+ */
+@Data
+public class InfoRedDotResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6417699657069808978L;
+
+    /**
+     * 我发出的，新回复数量
+     */
+    private Integer sentNewReplyCount;
+
+    /**
+     * 我收到的未读的消息数量
+     */
+    private Integer receivedUnReadCount;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java

@@ -10,6 +10,7 @@ import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO;
 import com.epmet.dataaggre.dto.message.form.InfoGroupDetailFormDTO;
 import com.epmet.dataaggre.dto.message.form.InfoRepliesFormDTO;
 import com.epmet.dataaggre.dto.message.result.InfoGroupDetailResDTO;
+import com.epmet.dataaggre.dto.message.result.InfoRedDotResultDTO;
 import com.epmet.dataaggre.dto.message.result.InfoReplyResDTO;
 import com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO;
 import com.epmet.dataaggre.service.epmetmessage.EpmetMessageService;
@@ -92,4 +93,16 @@ public class InfoController {
         ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
         return new Result<InfoReplyResDTO>().ok(epmetMessageService.queryInfoReplies(formDTO));
     }
+
+    /**
+     * @Description  【发送消息】我收到、我发送红点
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/20 3:38 下午
+     */
+    @PostMapping("reddot")
+    public Result<InfoRedDotResultDTO> redDot(@LoginUser TokenDto tokenDto){
+        return new Result<InfoRedDotResultDTO>().ok(epmetMessageService.redDot(tokenDto.getUserId()));
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO;
 import com.epmet.dataaggre.dto.message.form.InfoGroupDetailFormDTO;
 import com.epmet.dataaggre.dto.message.form.InfoRepliesFormDTO;
 import com.epmet.dataaggre.dto.message.result.InfoGroupDetailResDTO;
+import com.epmet.dataaggre.dto.message.result.InfoRedDotResultDTO;
 import com.epmet.dataaggre.dto.message.result.InfoReplyResDTO;
 import com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO;
 
@@ -53,4 +54,12 @@ public interface EpmetMessageService {
      * @date 2021/8/20 2:09 下午
      */
     InfoReplyResDTO queryInfoReplies(InfoRepliesFormDTO formDTO);
+
+    /**
+     * @Description  【发送消息】我收到、我发送红点
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/20 3:38 下午
+     */
+    InfoRedDotResultDTO redDot(String userId);
 }

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

@@ -177,6 +177,18 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
         return result;
     }
 
+    /**
+     * @Description  【发送消息】我收到、我发送红点
+     * 我发出的查询info_profile限制住created_by=当前用户， sum未读的回复数
+     * 我收到的info_receivers，并且未读的 count(distinct info_id)
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/20 3:38 下午
+     */
+    @Override
+    public InfoRedDotResultDTO redDot(String userId) {
+        return null;
+    }
 
 
 }