diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
index 0247e894b..4f8439cfc 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
+++ b/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";
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index 965ddcdd2..3d48b2842 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -221,8 +221,8 @@
true
47.104.224.45:8848
- 47.104.85.99
- 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ 219.146.91.110
+ a746dde3-7a13-4521-b986-7369b0b7c269
wx3ef8f2cd12a19fcb
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java
index 52d4c712a..83335db21 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java
+++ b/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>
* @Author yinzuomei
* @Description 获取当前部门可做操作
- * @Date 2020/1/13 16:48
+ * * @Date 2020/1/13 16:48
**/
@GetMapping("handleCategory")
public Result> queryHandleCategories() {
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/MasterGroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/MasterGroupFeignClient.java
new file mode 100644
index 000000000..b3c516896
--- /dev/null
+++ b/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
+ * @author lipf
+ * @date 2020/5/7 9:40
+ */
+ @GetMapping("cloudAnalysis/messageStatistics/{userId}")
+ Result messageStatistics(@PathVariable("userId") Long userId);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/MasterGroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/MasterGroupFeignClientFallback.java
new file mode 100644
index 000000000..5371bbd7f
--- /dev/null
+++ b/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 messageStatistics(Long userId) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "messageStatistics", userId);
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MasterGroupService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/MasterGroupService.java
new file mode 100644
index 000000000..2caaae43e
--- /dev/null
+++ b/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
+ * @author lipf
+ * @date 2020/5/7 9:40
+ */
+ Result messageStatistics(Long userId);
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MasterGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MasterGroupServiceImpl.java
new file mode 100644
index 000000000..d2161ea5b
--- /dev/null
+++ b/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 messageStatistics(Long userId) {
+ Result messageResult = masterGroupFeignClient.messageStatistics(userId);
+ return messageResult;
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
index 6ea6a68b6..cf85e3827 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
+++ b/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 getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) {
// 获取openId
@@ -260,7 +265,7 @@ public class WorkUserServiceImpl implements WorkUserService {
EpdcUnauthorizedAmountFromDTO unauthorizedFromDto = new EpdcUnauthorizedAmountFromDTO();
unauthorizedFromDto.setGridId(formDto.getDeptId());
Result unauthorizedResult = this.getUnauthorizedAmount(unauthorizedFromDto);
-
+ Result masterMesCount = masterGroupService.messageStatistics(SecurityUser.getUser().getId());
// 组装返回数据
List 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;
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml
index 8a46445fc..9b9b4f776 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml
+++ b/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