【工作端】-【书记在线消息提示】-lipf-2020/05/11

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java

@@ -103,4 +103,9 @@ public interface ServiceConstant {
      * 开放接口模块
      */
     String EPDC_API_SERVER = "epdc-api-server";
+
+    /**
+     * 数据分析模块
+     */
+    String EPDC_CLOUD_ANALYSIS_SERVER = "epdc-cloud-analysis-server";
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -221,8 +221,8 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>47.104.85.99</nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>a746dde3-7a13-4521-b986-7369b0b7c269</nacos.namespace>
 
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java

@@ -124,7 +124,7 @@ public class ApiWorkItemController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
      * @Author yinzuomei
      * @Description 获取当前部门可做操作
-     * @Date 2020/1/13 16:48
+     *      * @Date 2020/1/13 16:48
      **/
     @GetMapping("handleCategory")
     public Result<List<ItemHandleResultDTO>> queryHandleCategories() {

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/MasterGroupFeignClient.java

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
+import com.elink.esua.epdc.feign.fallback.MasterGroupFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+
+/**
+ * 管理端接口
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:27
+ */
+@FeignClient(name = ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, fallback = MasterGroupFeignClientFallback.class)
+public interface MasterGroupFeignClient {
+
+    /**
+     * 获取消息数
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
+     * @author lipf
+     * @date 2020/5/7 9:40
+     */
+    @GetMapping("cloudAnalysis/messageStatistics/{userId}")
+    Result<Integer> messageStatistics(@PathVariable("userId") Long userId);
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/MasterGroupFeignClientFallback.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.MasterGroupFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:30
+ */
+@Component
+public class MasterGroupFeignClientFallback implements MasterGroupFeignClient {
+
+    @Override
+    public Result<Integer> messageStatistics(Long userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "messageStatistics", userId);
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MasterGroupService.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+
+/**
+ * 书记在线相关接口
+ *
+ * @author lipf
+ * @date 2020/5/7 9:40
+ */
+public interface MasterGroupService {
+
+    /**
+     * 获取消息数
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
+     * @author lipf
+     * @date 2020/5/7 9:40
+     */
+    Result<Integer> messageStatistics(Long userId);
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MasterGroupServiceImpl.java

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+
+import com.elink.esua.epdc.feign.MasterGroupFeignClient;
+import com.elink.esua.epdc.service.MasterGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lipf
+ * @date 2020/5/7 9:40
+ */
+@Service
+public class MasterGroupServiceImpl implements MasterGroupService {
+
+
+    @Autowired
+    private MasterGroupFeignClient masterGroupFeignClient;
+
+    @Override
+    public Result<Integer> messageStatistics(Long userId) {
+        Result<Integer> messageResult = masterGroupFeignClient.messageStatistics(userId);
+        return messageResult;
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
+import com.elink.esua.epdc.service.MasterGroupService;
 import com.elink.esua.epdc.service.WorkIssueService;
 import com.elink.esua.epdc.service.WorkItemService;
 import com.elink.esua.epdc.service.WorkUserService;
@@ -63,6 +64,10 @@ public class WorkUserServiceImpl implements WorkUserService {
     @Autowired
     private WorkItemService workItemService;
 
+    @Autowired
+    private MasterGroupService masterGroupService;
+
+
     @Override
     public Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) {
         // 获取openId
@@ -260,7 +265,7 @@ public class WorkUserServiceImpl implements WorkUserService {
         EpdcUnauthorizedAmountFromDTO unauthorizedFromDto = new EpdcUnauthorizedAmountFromDTO();
         unauthorizedFromDto.setGridId(formDto.getDeptId());
         Result<Integer> unauthorizedResult = this.getUnauthorizedAmount(unauthorizedFromDto);
-
+        Result<Integer> masterMesCount = masterGroupService.messageStatistics(SecurityUser.getUser().getId());
         // 组装返回数据
         List<WorkAppMenuStatisticsResultDTO> resultDtoList = new ArrayList<>();
         boolean isItem = false;
@@ -286,6 +291,9 @@ public class WorkUserServiceImpl implements WorkUserService {
                     case WorkAppMenuConstant.WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED:
                         resultDto = this.packageMenuData(childDto.getNavCode(), unauthorizedResult.getData());
                         break;
+                    case WorkAppMenuConstant.WORK_APP_MENU_CODE_MASTER_GROUP:
+                        resultDto = this.packageMenuData(childDto.getNavCode(), masterMesCount.getData());
+                        break;
                     default:
                         break;
                 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml

@@ -1,4 +1,4 @@
 nacos:
   config:
     server-addr: 47.104.224.45:8848
-    namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+    namespace: a746dde3-7a13-4521-b986-7369b0b7c269