diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java index cf90afee5b..63114e5794 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java @@ -113,4 +113,9 @@ public class GridInfoCache implements Serializable { * 坐标区域 */ private String coordinates; + + /** + * 弃用标记 + */ + private Integer abandonFlag; } diff --git a/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java index c776cfbe47..800f23a357 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java index 869279e230..915724e664 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..c14a7efa4d 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + //// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 5ebed6c49e..da23d0701f 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -376,4 +376,13 @@ public interface GovIssueOpenFeignClient { */ @PostMapping("/gov/issue/issueprojectcategorydict/categoryMap/{customerId}") Result> getCategoryMap(@PathVariable("customerId") String customerId); + + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + @PostMapping("audit-reset") + Result issueAuditReset(@RequestParam("gridId")String gridId); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index ae87c2cd6b..20b827a9ad 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -319,4 +319,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getCategoryMap(String customerId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryMap", customerId); } + + @Override + public Result issueAuditReset(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueAuditReset", gridId); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 55f1348b44..ec49c3bb81 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -322,5 +322,16 @@ public class IssueController { return new Result>().ok(issueService.getProjectCountByGrid(formDTO)); } + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + @PostMapping("audit-reset") + public Result issueAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(issueService.issueAuditReset(gridId)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 0a82cb5530..1c5ae213ee 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -292,4 +292,20 @@ public interface IssueDao extends BaseDao { List selectCategoryNameByIssueList(List issueIds,@Param("customerId")String customerId); + /** + * Desc: 查询网格中表决中的议题个数 + * @param gridId + * @author zxc + * @date 2022/3/15 4:44 下午 + */ + Integer selectVotingIssue(@Param("gridId")String gridId); + + /** + * Desc: 查询网格中审核中的议题个数 + * @param gridId + * @author zxc + * @date 2022/3/15 4:44 下午 + */ + Integer selectAuditIssue(@Param("gridId")String gridId); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 01e16471da..1c8bd6c376 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -378,4 +378,12 @@ public interface IssueService extends BaseService { */ List getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO); + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + Boolean issueAuditReset(String gridId); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 70e8528491..fd4f54a866 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1744,5 +1744,26 @@ public class IssueServiceImpl extends BaseServiceImpl imp return result; } + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + @Override + public Boolean issueAuditReset(String gridId) { + // 表决中的议题个数 + Integer votingCount = baseDao.selectVotingIssue(gridId); + if (votingCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){ + return true; + } + // 审核中的议题个数 + Integer auditCount = baseDao.selectAuditIssue(gridId); + if (auditCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){ + return true; + } + return false; + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 3273fb243e..361e368d9f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -750,4 +750,23 @@ LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t1.categoryCode AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = #{customerId}) + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java index 7acfd64627..78fecfca6d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java @@ -151,4 +151,8 @@ public class CustomerGridDTO implements Serializable { * 联系电话 */ private String mobile; + /** + * 弃用：1；正常使用：0 + */ + private Boolean abandonFlag; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java new file mode 100644 index 0000000000..1d1aca23e1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +@Data +public class AbandonGridFormDTO implements Serializable { + @NotBlank(message = "网格id不能为空",groups = AddGroup.class) + private String gridId; +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 777645a3c1..0331f95ce7 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -136,6 +136,12 @@ 3.0.3 compile + + com.epmet + gov-issue-client + 2.0.0 + compile + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index f7c4d8ec10..60ffda8b94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -226,4 +227,16 @@ public class GridController { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(customerGridService.getGridTree(formDTO)); } + + /** + * 弃用网格 + * @param formDTO + * @return + */ + @PostMapping("abandon") + public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + customerGridService.abandonGrid(formDTO); + return new Result(); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java index d6018c2a29..379d916654 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java @@ -109,4 +109,9 @@ public class CustomerGridEntity extends BaseEpmetEntity { * 联系电话 */ private String mobile; + + /** + * 弃用：1；正常使用：0 + */ + private Boolean abandonFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index cac10ea123..c57c5052ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -374,4 +374,11 @@ public interface CustomerGridService extends BaseService { * @date 2022/1/17 3:50 下午 */ List getStaffGridList(String customerId, String orgId, String orgType); + + /** + * 弃用网格，前置条件查询 + * @param formDTO + * @return + */ + void abandonGrid(AbandonGridFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index db8174b51d..07bfa4eaf0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -250,6 +250,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl gridList = customerGridDao.selectGridList(canTick.getAgencyId()); List gridStaffs = new ArrayList<>(); if (null != gridList && gridList.size() > NumConstant.ZERO) { @@ -728,6 +729,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); returnDTO.setGridList(gridList); //递归查询当前组织的下级组织以及每个下级组织对应的网格列表 @@ -762,6 +764,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = baseDao.selectAllSubAgency(subAgencyPids); if (subAgencyList.size() > NumConstant.ZERO) { for (ArticleGridResultDTO sub : subAgencyList) { + //未隐藏的网格 List gridList = customerGridDao.selectAgencyGridList(sub.getAgencyId()); sub.setGridList(gridList); List subAgency = getGridList(sub.getPids() + ":" + sub.getAgencyId()); @@ -826,11 +829,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId()); returnDTO.setAgencyDeptList(agencyDeptList); //当前机关下网格列表 + // 未隐藏的网格 List agencyGridList = customerGridDao.selectAgencyGridMsgList(agencyEntity.getId()); returnDTO.setAgencyGridList(agencyGridList); } else if (gridParty) { //4.2:查询人员在当前机关下参与的网格列表 //查询当前组织下的网格列表 + //未隐藏的网格 List gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); //查询该工作人员在该客户下参与的网格列表 CustomerStaffGridDTO staffGridDTO = new CustomerStaffGridDTO(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index cd0080f548..2f5436c710 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; @@ -28,6 +29,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; @@ -43,10 +45,8 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerGridEntity; -import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetMessageOpenFeignClient; -import com.epmet.feign.EpmetUserFeignClient; -import com.epmet.feign.OperCrmOpenFeignClient; +import com.epmet.feign.*; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; import com.epmet.util.ModuleConstant; @@ -88,10 +88,21 @@ public class CustomerGridServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -945,4 +956,40 @@ public class CustomerGridServiceImpl extends BaseServiceImpl eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId()); + //表决中的议题 + Result issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId()); + if (eventRes.success() || issueAuditReset.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "校验数据异常", "服务器开小差了..."); + } + if (eventRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未处理的事件", "该网格存在未办结的群众直报事件，请先将事件办结后再操作"); + } + if (issueAuditReset.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题，请处理完再操作"); + } + + //可以弃用、处理数据 todo + // .... + // .... + + + //处理成功，隐藏网格 + LambdaUpdateWrapper updateGrid=new LambdaUpdateWrapper<>(); + updateGrid.set(CustomerGridEntity::getAbandonFlag,true); + updateGrid.eq(CustomerGridEntity::getId,formDTO.getGridId()); + baseDao.update(null,updateGrid); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql new file mode 100644 index 0000000000..1822215609 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql @@ -0,0 +1,3 @@ +alter table customer_grid +add column ABANDON_FLAG TINYINT(1) default '0' +comment '弃用：1；正常使用：0' after SYNC_FLAG; \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 357c8cebdc..e805ace544 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -174,7 +174,9 @@ INNER JOIN customer_staff_grid csg ON cg.id = csg.grid_id WHERE cg.del_flag = '0' + AND cg.ABANDON_FLAG='0' AND csg.del_flag = '0' + AND cg.ABANDON_FLAG='0' AND csg.user_id = #{userId} ORDER BY cg.GRID_NAME ASC @@ -288,6 +290,7 @@ CUSTOMER_GRID WHERE DEL_FLAG = '0' + and ABANDON_FLAG='0' AND PID = #{agencyId} @@ -307,6 +310,7 @@ CUSTOMER_GRID DEL_FLAG = '0' + AND ABANDON_FLAG='0' AND PID = #{agencyId} ORDER BY CREATED_TIME DESC @@ -338,6 +342,7 @@ WHERE cg.del_flag = '0' AND ca.del_flag = '0' AND cg.SYNC_FLAG='1' + and cg.ABANDON_FLAG='0' AND cg.id IN #{id} @@ -371,6 +376,7 @@ grid_name AS "gridName" FROM customer_grid WHERE del_flag = '0' + and ABANDON_FLAG='0' AND pid = #{agencyId} ORDER BY created_time DESC @@ -407,6 +413,7 @@ grid_name AS "gridName" FROM customer_grid WHERE del_flag = '0' + and ABANDON_FLAG='0' AND pid = #{agencyId} @@ -428,6 +435,7 @@ WHERE cg.del_flag = '0' AND ca.del_flag = '0' + and cg.ABANDON_FLAG='0' AND cg.pid = #{agencyId} @@ -457,6 +465,7 @@ WHERE grid.del_flag = 0 and grid.SYNC_FLAG='1' + and grid.ABANDON_FLAG='0' AND grid.area_code LIKE CONCAT(#{areaCode},'%') @@ -497,6 +506,7 @@ WHERE a.del_flag = 0 and a.SYNC_FLAG='1' + and a.ABANDON_FLAG='0' AND a.customer_id = #{customerId} ) AS c ORDER BY CONVERT ( gridName USING gbk ) ASC diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 9f58bbb306..6fcfe0827c 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -9,10 +9,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.GovProjectOpenFeignClientFallbackFactory; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import org.springframework.cloud.openfeign.FeignClient; -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.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -152,4 +149,13 @@ public interface GovProjectOpenFeignClient { **/ @PostMapping("gov/project/resievent/autoAudit") Result autoAudit(); + + /** + * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 5:05 下午 + */ + @PostMapping("audit-reset") + Result eventAuditReset(@RequestParam("gridId")String gridId); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 58da1494d8..e3b6e51677 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -154,4 +154,9 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result autoAudit() { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "autoAudit"); } + + @Override + public Result eventAuditReset(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "eventAuditReset",gridId); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 077b06e22d..7aa1ae7501 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -325,4 +325,15 @@ public class ProjectController { projectService.projectWorkMinutesJob(dto); return new Result(); } + + /** + * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 5:05 下午 + */ + @PostMapping("audit-reset") + public Result eventAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(projectService.eventAuditReset(gridId)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index b5a3e5107e..650d598e1b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -283,4 +283,13 @@ public interface ProjectDao extends BaseDao { * @Date 2022/1/12 17:05 */ List getProjectListForWorkMinutes(@Param("customerId")String customerId, @Param("projectId")String projectId, @Param("status")String status); + + /** + * Desc: 查询网格下群众直报处理中的个数 + * @param gridId + * @author zxc + * @date 2022/3/15 5:09 下午 + */ + Integer selectEventStatus(@Param("gridId") String gridId); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 4757113bc7..139fba06c8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -376,4 +376,13 @@ public interface ProjectService extends BaseService { * @Date 2022/1/4 16:27 */ PageData approvaledList(ApprovaledListFromDTO formDTO); + + /** + * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 5:05 下午 + */ + Boolean eventAuditReset(String gridId); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 80ceb02393..9310f718f3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3134,6 +3134,21 @@ public class ProjectServiceImpl extends BaseServiceImpl + + + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java index a25220cbfb..33aa03c9ab 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 284526ad4d..6118195219 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -103,12 +103,11 @@ feign: coreSize: 20 maximumSize: 50 maxQueueSize: 500 - queueSizeRejectionThreshold: 8000 + queueSizeRejectionThreshold: 800 client: config: default: loggerLevel: BASIC - okhttp: enabled: true hystrix: @@ -118,6 +117,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 800 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java index d2e021b4d0..1ffeff276d 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java @@ -131,7 +131,7 @@ public class StrangerResiGuideController { /** * @param * @Author sun - * @Description 单客户-陌生访客根据自动定位获取附近网格数据 + * @Description 单客户-陌生访客根据自动定位获取附近网格数据 陌生人选网格+去其他网格看看 **/ @PostMapping("publiclocationgridlist") Result> publicLocationGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){ diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index de5e28a457..b044e1bdbb 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; @@ -13,6 +16,7 @@ import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; +import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -25,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -116,26 +121,59 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { JSONObject toResult = JSON.parseObject(data); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); if (null != toResult.get("code")) { - mapToResult.setCode(((Integer) toResult.get("code")).intValue()); + mapToResult.setCode((Integer) toResult.get("code")); } if (!mapToResult.success()) { logger.error(String.format("根据appId查询客户信息失败，对应appId->" + formDTO.getAppId())); throw new RenException(mapToResult.getMsg()); } - Object PublicCustomerResultDTO = mapToResult.getData(); - JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); - Map map = (Map) json.get("customer"); + Object publicCustomerResultDTO = mapToResult.getData(); + JSONObject json = JSON.parseObject(publicCustomerResultDTO.toString()); + Map map = (Map) json.get("customer"); PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); //2.调用epmet-user服务，根据客户Id和用户Id查询最后一次访问记录 + LatestGridInfoResultDTO result = null; formDTO.setCustomerId(customer.getId()); - Result userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO); + Result> userResult = epmetUserOpenFeignClient.latestGridList(formDTO); if (!userResult.success()) { logger.error(String.format("居民端获取用户最近访问网格失败,接口入参客户Id->%s,appId->%s,调用epmet-user-server服务返回->%s", formDTO.getCustomerId(), formDTO.getAppId(), JSON.toJSONString(userResult))); + return result; } - return userResult.getData(); + for (LatestGridInfoResultDTO girdInfo : userResult.getData()) { + try { + GridInfoCache grid = CustomerOrgRedis.getGridInfo(girdInfo.getGridId()); + if (grid == null) { + logger.warn("latestGridInfo get gridInfo return null,gridId:{}", girdInfo.getGridId()); + continue; + } else { + Integer abandonFlag = grid.getAbandonFlag(); + if (NumConstant.ONE == abandonFlag) { + logger.warn("latestGridInfo gridId:{} has abandoned", girdInfo.getGridId()); + continue; + } else { + result = girdInfo; + //匹配到了未弃用的网格 跳出 + break; + } + } + } catch (Exception e) { + logger.warn("latestGridInfo get gridInfo exception,gridId:{}", girdInfo.getGridId()); + } + } + + // 查询注册网格的弃用状态 + Result> userBaseInfo = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(formDTO.getUserId())); + if (!userBaseInfo.success()){ + throw new EpmetException("查询用户基本信息失败"); + } + GridInfoCache grid = CustomerOrgRedis.getGridInfo(userBaseInfo.getData().get(NumConstant.ZERO).getRegisteredGridId()); + if (grid != null) { + result.setRegisterGridStatus(grid.getAbandonFlag().compareTo(NumConstant.ONE) == NumConstant.ZERO ? true : false); + } + return result; } /** diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java new file mode 100644 index 0000000000..1b900df696 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java @@ -0,0 +1,31 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/3/15 8:00 下午 + * @DESC + */ +@Data +public class WarnAndPartyAuditResultDTO implements Serializable { + + private static final long serialVersionUID = 6971169159679812283L; + + /** + * 是否存在党员审核 + */ + private Boolean partyMemberStatus; + + /** + * 是否存在热心居民审核 + */ + private Boolean warnStatus; + + public WarnAndPartyAuditResultDTO() { + this.partyMemberStatus = false; + this.warnStatus = false; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 0f320cf9be..debdc9afea 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFor import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback; import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -105,4 +106,13 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping(value = "/resi/partymember/partymemberinfo/getpartymemberinfobycustomerid") Result> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId); + /** + * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:19 下午 + */ + @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset") + Result partyMemberAuditReset(@RequestParam("gridId")String gridId); + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 953d5ca326..f7fe137a60 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFor import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import org.springframework.stereotype.Component; @@ -69,4 +70,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result> getPartyMemberInfoByCustomerId(String customerId) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberInfoByCustomerId", customerId); } + + @Override + public Result partyMemberAuditReset(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberAuditReset", gridId); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java index e776590957..ec0ae2d39c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partymember.excel.PartymemberConfirmManualExcel; import com.epmet.modules.partymember.service.PartymemberConfirmManualService; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -91,4 +92,15 @@ public class PartymemberConfirmManualController { ExcelUtils.exportExcelToTarget(response, null, list, PartymemberConfirmManualExcel.class); } + /** + * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:19 下午 + */ + @PostMapping("audit-reset") + public Result partyMemberAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId)); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java index 4834e28601..e3154645cf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java @@ -20,6 +20,7 @@ package com.epmet.modules.partymember.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 党员认证人工审核表 人工审核时要展示自动审核的结果，同事允许前台去修改党员认证信息表的数据 @@ -29,5 +30,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PartymemberConfirmManualDao extends BaseDao { - + + /** + * Desc: 查询网格下存在党员审核个数 + * @param gridId + * @author zxc + * @date 2022/3/15 4:24 下午 + */ + Integer partyMemberAuditReset(@Param("gridId")String gridId); + + /** + * Desc: 查询网格下热心居民审核个数 + * @param gridId + * @author zxc + * @date 2022/3/15 8:11 下午 + */ + Integer warnAuditReset(@Param("gridId")String gridId); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java index d3e02c1df2..6785ff7ce0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import java.util.List; import java.util.Map; @@ -100,4 +101,12 @@ public interface PartymemberConfirmManualService extends BaseService - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java index 105501553f..a2de9963fa 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java index 3df970fc0c..7f32733eb8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java @@ -35,4 +35,9 @@ public class LatestGridInfoFormDTO implements Serializable { */ private String userId; + /** + * 前n个 默认10 + */ + private Integer top = 10; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java index ddf04a0fe7..af656061dd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java @@ -23,4 +23,9 @@ public class LatestGridInfoResultDTO implements Serializable { */ private String gridId; + /** + * 居民注册网格弃用状态 true：弃用，false：正常使用 + */ + private Boolean registerGridStatus = false; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 0ed71a07f0..bd1eaf511d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1,7 +1,6 @@ package com.epmet.feign; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; @@ -260,7 +259,7 @@ public interface EpmetUserOpenFeignClient { * @Date 2020/8/3 **/ @PostMapping(value = "epmetuser/gridlatest/latestgridinfo") - Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO); + Result> latestGridList(@RequestBody LatestGridInfoFormDTO formDTO); /** * @Description 查询工作人员的信息 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 0f9f38ea5c..f614e8ea46 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -180,7 +180,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result latestGridInfo(LatestGridInfoFormDTO formDTO) { + public Result> latestGridList(LatestGridInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index e25083f669..7c02a9df9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -206,4 +206,16 @@ public class BadgeController { List users = badgeService.listUsersByBadge(customerId, badgeKey); return new Result>().ok(users); } + + /** + * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否 + * @param gridId + * @author zxc + * @date 2022/3/16 9:42 上午 + */ + @PostMapping("audit-reset") + public Result badgeAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(badgeService.badgeAuditReset(gridId)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index c470d793a9..f1faa9a29a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java @@ -139,8 +139,8 @@ public class GridLatestController { * @Date 2020/8/3 **/ @PostMapping("latestgridinfo") - public Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ - return new Result().ok(gridLatestService.latestGridInfo(formDTO)); + public Result> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ + return new Result>().ok(gridLatestService.latestGridInfo(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index d2a10f7026..113ed28dee 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -204,4 +204,13 @@ public interface BadgeDao extends BaseDao { * @date 2021.08.02 10:40 */ List listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey); + + /** + * Desc: 查询网格下的徽章审核个数 + * @param gridId + * @author zxc + * @date 2022/3/16 9:52 上午 + */ + Integer badgeAuditReset(@Param("gridId") String gridId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java index 979ac85a5f..7e28dc8154 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java @@ -73,5 +73,5 @@ public interface GridLatestDao extends BaseDao { * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 * @Date 2020/8/3 **/ - LatestGridInfoResultDTO selectLatestGridInfo(LatestGridInfoFormDTO formDTO); + List selectLatestGridInfo(LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index fc06714fd9..4b2252b51c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -200,4 +200,13 @@ public interface BadgeService extends BaseService { * @date 2021.08.02 10:39 */ List listUsersByBadge(String customerId, String badgeKey); + + /** + * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否 + * @param gridId + * @author zxc + * @date 2022/3/16 9:42 上午 + */ + Boolean badgeAuditReset(String gridId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java index e9ff239d1e..4716ff8bcd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java @@ -139,5 +139,5 @@ public interface GridLatestService extends BaseService { * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 * @Date 2020/8/3 **/ - LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO); + List latestGridInfo(LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index de2f864ff0..5667c6d401 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -495,4 +495,19 @@ public class BadgeServiceImpl extends BaseServiceImpl imp public List listUsersByBadge(String customerId, String badgeKey) { return baseDao.listUsersByBadge(customerId, badgeKey); } + + /** + * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否 + * @param gridId + * @author zxc + * @date 2022/3/16 9:42 上午 + */ + @Override + public Boolean badgeAuditReset(String gridId) { + Integer badgeAuditCount = baseDao.badgeAuditReset(gridId); + if (badgeAuditCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){ + return true; + } + return false; + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index 58f9383078..ad2f79f266 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -36,7 +36,6 @@ import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.GridLatestEntity; -import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.redis.UserBaseInfoRedis; import com.epmet.service.GridLatestService; import com.epmet.util.ModuleConstant; @@ -205,7 +204,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl latestGridInfo(LatestGridInfoFormDTO formDTO) { return baseDao.selectLatestGridInfo(formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 09c84bde81..275babd61f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -330,4 +330,14 @@ and user_base_info.DEL_FLAG = 0) + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml index 59f1be1af7..b06b1a8069 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml @@ -109,6 +109,6 @@ AND gl.CUSTOMER_USER_ID = #{userId} ORDER BY gl.LATEST_TIME DESC - LIMIT 1 + LIMIT #{top}