Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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;
 }

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                //// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<Map<String, String>> getCategoryMap(@PathVariable("customerId") String customerId);
+
+	/**
+	 * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/15 4:40 下午
+	 */
+	@PostMapping("audit-reset")
+	Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId);
 }

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<Map<String, String>> getCategoryMap(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryMap", customerId);
 	}
+
+    @Override
+    public Result<Boolean> issueAuditReset(String gridId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueAuditReset", gridId);
+    }
 }

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<List<ProjectDistributionAnalysisRightDTO>>().ok(issueService.getProjectCountByGrid(formDTO));
     }
 
+    /**
+     * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:40 下午
+     */
+    @PostMapping("audit-reset")
+    public Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<Boolean>().ok(issueService.issueAuditReset(gridId));
+    }
+
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -292,4 +292,20 @@ public interface IssueDao extends BaseDao<IssueEntity> {
 
     List<ResiBuzzIssueCategoryDTO> selectCategoryNameByIssueList(List<ResiBuzzLeftPieChartResultDTO> 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);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -378,4 +378,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      */
     List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO);
 
+    /**
+     * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:40 下午
+     */
+    Boolean issueAuditReset(String gridId);
+
 }

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<IssueDao, IssueEntity> 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;
+    }
+
 
 }

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})
         </foreach>
     </select>
+
+    <!-- 查询网格中表决中的议题个数 -->
+    <select id="selectVotingIssue" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM issue
+        WHERE del_flag = 0
+          AND grid_id = #{gridId}
+    </select>
+
+    <!-- 查询网格中审核中的议题个数 -->
+    <select id="selectAuditIssue" resultType="java.lang.Integer">
+        SELECT
+            count( id )
+        FROM issue_application
+        WHERE DEL_FLAG = '0'
+          AND APPLY_STATUS = 'under_auditing'
+          AND GRID_ID = #{gridId}
+    </select>
 </mapper>

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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;
 }

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;
+}

epmet-module/gov-org/gov-org-server/pom.xml

@@ -136,6 +136,12 @@
             <version>3.0.3</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<List<GridTreeResultDTO>>().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();
+    }
 }

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;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -374,4 +374,11 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2022/1/17 3:50 下午
      */
     List<CustomerStaffGridResultDTO> getStaffGridList(String customerId, String orgId, String orgType);
+
+    /**
+     * 弃用网格，前置条件查询
+     * @param formDTO
+     * @return
+     */
+    void abandonGrid(AbandonGridFormDTO formDTO);
 }

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<CustomerAgencyDao
         }
         //3:根据组织Id查询该组织下网格、人员列表
         //3.1:查询组织下网格列表
+        // 未隐藏的网格
         List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId());
         List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>();
         if (null != gridList && gridList.size() > NumConstant.ZERO) {
@@ -728,6 +729,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         if (party) {
             //4.1:查询当前机关的网格列表以及所有下级机关的网格列表
             //当前机关下网格列表
+            // 未隐藏的网格
             List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId());
             returnDTO.setGridList(gridList);
             //递归查询当前组织的下级组织以及每个下级组织对应的网格列表
@@ -762,6 +764,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         List<ArticleGridResultDTO> subAgencyList = baseDao.selectAllSubAgency(subAgencyPids);
         if (subAgencyList.size() > NumConstant.ZERO) {
             for (ArticleGridResultDTO sub : subAgencyList) {
+                //未隐藏的网格
                 List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(sub.getAgencyId());
                 sub.setGridList(gridList);
                 List<ArticleGridResultDTO> subAgency = getGridList(sub.getPids() + ":" + sub.getAgencyId());
@@ -826,11 +829,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             List<AgencyDeptList> agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId());
             returnDTO.setAgencyDeptList(agencyDeptList);
             //当前机关下网格列表
+            // 未隐藏的网格
             List<AgencyGridList> agencyGridList = customerGridDao.selectAgencyGridMsgList(agencyEntity.getId());
             returnDTO.setAgencyGridList(agencyGridList);
         } else if (gridParty) {
             //4.2:查询人员在当前机关下参与的网格列表
             //查询当前组织下的网格列表
+            //未隐藏的网格
             List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId());
             //查询该工作人员在该客户下参与的网格列表
             CustomerStaffGridDTO staffGridDTO = new CustomerStaffGridDTO();

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.*;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerGridService;
 import com.epmet.util.ModuleConstant;
@@ -88,10 +88,21 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
-    @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
 
+
+    //迁移网格
+    @Autowired
+    private GovIssueOpenFeignClient govIssueOpenFeignClient;
+    @Autowired
+    private GovProjectOpenFeignClient govProjectOpenFeignClient;
+    @Autowired
+    private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+
+
     @Override
     public PageData<CustomerGridDTO> page(Map<String, Object> params) {
         IPage<CustomerGridEntity> page = baseDao.selectPage(
@@ -945,4 +956,40 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return baseDao.getStaffGridList(customerId,orgId,orgType);
     }
 
+
+    /**
+     * 弃用网格
+     *
+     * @param formDTO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void abandonGrid(AbandonGridFormDTO formDTO) {
+        //未处理的事件
+        Result<Boolean> eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId());
+        //表决中的议题
+        Result<Boolean> 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<CustomerGridEntity> updateGrid=new LambdaUpdateWrapper<>();
+        updateGrid.set(CustomerGridEntity::getAbandonFlag,true);
+        updateGrid.eq(CustomerGridEntity::getId,formDTO.getGridId());
+        baseDao.update(null,updateGrid);
+    }
+
 }

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;

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
     </select>
@@ -288,6 +290,7 @@
           CUSTOMER_GRID
         WHERE
           DEL_FLAG = '0'
+          and ABANDON_FLAG='0'
         AND
           PID = #{agencyId}
     </select>
@@ -307,6 +310,7 @@
             CUSTOMER_GRID
         <where>
             DEL_FLAG = '0'
+            AND ABANDON_FLAG='0'
             AND PID = #{agencyId}
             ORDER BY CREATED_TIME DESC
             <if test="null != pageSize and pageSize > 0">
@@ -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
         <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
             #{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
     </select>
@@ -407,6 +413,7 @@
             grid_name AS "gridName"
         FROM customer_grid
         WHERE del_flag = '0'
+         and ABANDON_FLAG='0'
          AND pid = #{agencyId}
     </select>
 
@@ -428,6 +435,7 @@
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'
+        and cg.ABANDON_FLAG='0'
         AND cg.pid = #{agencyId}
     </select>
 
@@ -457,6 +465,7 @@
        WHERE
            grid.del_flag = 0
            and grid.SYNC_FLAG='1'
+           and grid.ABANDON_FLAG='0'
             <if test='areaCode != "" and areaCode != null'>
                AND grid.area_code LIKE CONCAT(#{areaCode},'%')
             </if>
@@ -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

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.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 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<Boolean> eventAuditReset(@RequestParam("gridId")String gridId);
 }

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<Boolean> eventAuditReset(String gridId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "eventAuditReset",gridId);
+    }
 }

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<Boolean> eventAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<Boolean>().ok(projectService.eventAuditReset(gridId));
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@@ -283,4 +283,13 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @Date 2022/1/12 17:05
 	 */
 	List<ProjectEntity> 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);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@@ -376,4 +376,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @Date 2022/1/4 16:27
 	 */
 	PageData<ApprovaledListResultDTO>  approvaledList(ApprovaledListFromDTO formDTO);
+
+	/**
+	 * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/15 5:05 下午
+	 */
+	Boolean eventAuditReset(String gridId);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -3133,6 +3133,21 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return new PageData<>(list, pageInfo.getTotal());
 	}
 
+	/**
+	 * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/15 5:05 下午
+	 */
+    @Override
+    public Boolean eventAuditReset(String gridId) {
+		Integer processingCount = baseDao.selectEventStatus(gridId);
+		if (processingCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+			return true;
+		}
+		return false;
+    }
+
     /**
 	 * @Description  区间项目分类数量处理
 	 * 查询的是时间段内的分类项目数，查询的时间 是传入一个日期，拼上时间，在进行比较大小

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -528,4 +528,14 @@
             AND a.`STATUS` = #{status}
         </if>
     </select>
+
+    <!-- 查询网格下群众直报处理中的个数 -->
+    <select id="selectEventStatus" resultType="java.lang.Integer">
+        SELECT
+            COUNT( ID )
+        FROM resi_event
+        WHERE DEL_FLAG = '0'
+          AND `STATUS` = 'processing'
+          AND GRID_ID = #{gridId}
+    </select>
 </mapper>

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<List<PublicCustomerGridForStrangerResultDTO>> publicLocationGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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();
+		Object publicCustomerResultDTO = mapToResult.getData();
-		JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
+		JSONObject json = JSON.parseObject(publicCustomerResultDTO.toString());
-		Map<String, Object> map = (Map) json.get("customer");
+		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<LatestGridInfoResultDTO> userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO);
+		Result<List<LatestGridInfoResultDTO>> 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<List<UserBaseInfoResultDTO>> 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;
 	}
 
 	/**

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;
+    }
+}

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<List<PartymemberInfoDTO>> 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<WarnAndPartyAuditResultDTO> partyMemberAuditReset(@RequestParam("gridId")String gridId);
+
 }

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<List<PartymemberInfoDTO>> getPartyMemberInfoByCustomerId(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberInfoByCustomerId", customerId);
     }
+
+    @Override
+    public Result<WarnAndPartyAuditResultDTO> partyMemberAuditReset(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberAuditReset", gridId);
+    }
 }

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<WarnAndPartyAuditResultDTO> partyMemberAuditReset(@RequestParam("gridId")String gridId){
+        return new Result<WarnAndPartyAuditResultDTO>().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId));
+    }
+
 }

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;
 
 /**
  * 党员认证人工审核表 人工审核时要展示自动审核的结果，同事允许前台去修改党员认证信息表的数据
@@ -30,4 +31,20 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PartymemberConfirmManualDao extends BaseDao<PartymemberConfirmManualEntity> {
 
+    /**
+     * 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);
+
 }

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<Partymember
 	 * @return
 	 */
 	PartymemberConfirmManualDTO getInfoByPartyMemberInfoId(String partymemberInfoId);
+
+	/**
+	 * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/15 4:19 下午
+	 */
+	WarnAndPartyAuditResultDTO partyMemberAuditReset(String gridId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.PartyMemberConstant;
@@ -29,6 +30,7 @@ import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity;
 import com.epmet.modules.partymember.redis.PartymemberConfirmManualRedis;
 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -112,4 +114,26 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl<Partyme
         return ConvertUtils.sourceToTarget(entity, PartymemberConfirmManualDTO.class);
     }
 
+    /**
+     * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/15 4:19 下午
+     */
+    @Override
+    public WarnAndPartyAuditResultDTO partyMemberAuditReset(String gridId) {
+        WarnAndPartyAuditResultDTO result = new WarnAndPartyAuditResultDTO();
+        // 查询网格下是否存在党员审核
+        Integer integer = baseDao.partyMemberAuditReset(gridId);
+        if (integer.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            result.setPartyMemberStatus(true);
+        }
+        // 网格下是否存在热心居民审核
+        Integer warnCount = baseDao.warnAuditReset(gridId);
+        if (warnCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            result.setWarnStatus(true);
+        }
+        return result;
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberConfirmManualDao.xml

@@ -3,21 +3,25 @@
 
 <mapper namespace="com.epmet.modules.partymember.dao.PartymemberConfirmManualDao">
 
-    <resultMap type="com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity" id="partymemberConfirmManualMap">
+    <!-- 查询网格下存在党员审核个数 -->
-        <result property="id" column="ID"/>
+    <select id="partyMemberAuditReset" resultType="java.lang.Integer">
-        <result property="customerId" column="CUSTOMER_ID"/>
+        SELECT
-        <result property="userId" column="USER_ID"/>
+            COUNT( ID )
-        <result property="gridId" column="GRID_ID"/>
+        FROM partymember_confirm_manual
-        <result property="partymemberInfoId" column="PARTYMEMBER_INFO_ID"/>
+        WHERE DEL_FLAG = 0
-        <result property="auditStatus" column="AUDIT_STATUS"/>
+          AND AUDIT_STATUS = 'under_auditting'
-        <result property="refuseReason" column="REFUSE_REASON"/>
+          AND GRID_ID = #{gridId}
-        <result property="delFlag" column="DEL_FLAG"/>
+    </select>
-        <result property="revision" column="REVISION"/>
+
-        <result property="createdBy" column="CREATED_BY"/>
+    <!-- 查询网格下热心居民审核个数 -->
-        <result property="createdTime" column="CREATED_TIME"/>
+    <select id="warnAuditReset" resultType="java.lang.Integer">
-        <result property="updatedBy" column="UPDATED_BY"/>
+        SELECT
-        <result property="updatedTime" column="UPDATED_TIME"/>
+            COUNT(ID)
-    </resultMap>
+        FROM resi_warmhearted_apply
+        WHERE DEL_FLAG = '0'
+          AND AUDIT_STATUS = 'under_auditting'
+          AND GRID_ID = #{gridId}
+    </select>
 
 
 </mapper>

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

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;
+
 }

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;
+
 }

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<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
+    Result<List<LatestGridInfoResultDTO>> latestGridList(@RequestBody LatestGridInfoFormDTO formDTO);
 
     /**
      * @Description  查询工作人员的信息

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<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) {
+    public Result<List<LatestGridInfoResultDTO>> latestGridList(LatestGridInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO);
     }
 

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<String> serviceList = serviceListView.getData();
-                log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
+                // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
 
                 for (String service : serviceList) {
                     try {

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -206,4 +206,16 @@ public class BadgeController {
 		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(customerId, badgeKey);
 		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
 	}
+
+	/**
+	 * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/16 9:42 上午
+	 */
+	@PostMapping("audit-reset")
+	public Result<Boolean> badgeAuditReset(@RequestParam("gridId")String gridId){
+		return new Result<Boolean>().ok(badgeService.badgeAuditReset(gridId));
+	}
+
 }

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<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
+    public Result<List<LatestGridInfoResultDTO>> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
-        return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
+        return new Result<List<LatestGridInfoResultDTO>>().ok(gridLatestService.latestGridInfo(formDTO));
     }
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java

@@ -204,4 +204,13 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @date 2021.08.02 10:40
 	*/
     List<ListUserByBadgeResultDTO> 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);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java

@@ -73,5 +73,5 @@ public interface GridLatestDao extends BaseDao<GridLatestEntity> {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    LatestGridInfoResultDTO selectLatestGridInfo(LatestGridInfoFormDTO formDTO);
+    List<LatestGridInfoResultDTO> selectLatestGridInfo(LatestGridInfoFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java

@@ -200,4 +200,13 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @date 2021.08.02 10:39
     */
     List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey);
+
+    /**
+     * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/16 9:42 上午
+     */
+    Boolean badgeAuditReset(String gridId);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java

@@ -139,5 +139,5 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO);
+    List<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java

@@ -495,4 +495,19 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     public List<ListUserByBadgeResultDTO> 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;
+    }
 }

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<GridLatestDao, GridLa
      * @Date 2020/8/3
      **/
     @Override
-    public LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO) {
+    public List<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) {
 
         return baseDao.selectLatestGridInfo(formDTO);
     }

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -330,4 +330,14 @@
                             and user_base_info.DEL_FLAG = 0)
 
     </select>
+
+    <!-- 查询网格下的徽章审核个数 -->
+    <select id="badgeAuditReset" resultType="java.lang.Integer">
+        SELECT
+            COUNT(ID)
+        FROM user_badge_certificate_record
+        WHERE DEL_FLAG = '0'
+          AND AUDIT_STATUS = 'auditing'
+          AND GRID_ID = #{gridId}
+    </select>
 </mapper>

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}
     </select>
 </mapper>