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

epmet-gateway/pom.xml

@@ -130,14 +130,17 @@
                 <!--   12、居民端陌生人导览             -->
                 <gateway.routes.resi-guide-server.uri>lb://resi-guide-server</gateway.routes.resi-guide-server.uri>
                 <!--   13、政府组织管理            -->
+<!--                <gateway.routes.gov-org-server.uri>http://localhost:8092</gateway.routes.gov-org-server.uri>-->
                 <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
                 <!--   15、居民端个人信息            -->
+<!--                <gateway.routes.resi-mine-server.uri>http://localhost:8094</gateway.routes.resi-mine-server.uri>-->
                 <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
                 <!--   16、居民端楼院校组             -->
                 <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
                 <!--   17、党员认证、热心居民申请             -->
+<!--                <gateway.routes.resi-partymember-server.uri>http://localhost:8096</gateway.routes.resi-partymember-server.uri>-->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
                 <!--   18、政府端网格管理             -->
                 <gateway.routes.gov-grid-server.uri>lb://gov-grid-server</gateway.routes.gov-grid-server.uri>
@@ -146,6 +149,7 @@
                 <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
 
                 <!--20.政府端-我的-服务-->
+<!--                <gateway.routes.gov-mine-server.uri>http://localhost:8098</gateway.routes.gov-mine-server.uri>-->
                 <gateway.routes.gov-mine-server.uri>lb://gov-mine-server</gateway.routes.gov-mine-server.uri>
                 <!--  21、居民端党群e事              -->
                 <gateway.routes.resi-hall-server.uri>lb://resi-hall-server</gateway.routes.resi-hall-server.uri>

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.11
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.12
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.11</version>
+    <version>0.3.12</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -25,5 +26,5 @@ public interface GovIssueFeignClient {
      * @Date 2020/5/13 15:47
      **/
     @PostMapping(value = "/gov/issue/issue/queryvotingissuecount",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result queryVotingIssueCount(@RequestBody List<String> gridIdList);
+    Result<List<GridProcessingCountResultDTO>> queryVotingIssueCount(@RequestBody List<String> gridIdList);
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -112,7 +112,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkIssueProcessing(String gridId, List<GridProcessingCountResultDTO> issueProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : issueProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null!=gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }
@@ -123,7 +125,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkPartyMemberProcessing(String gridId, List<GridProcessingCountResultDTO> partyMemberProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : partyMemberProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null != gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }
@@ -134,7 +138,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkResiProcessing(String gridId, List<GridProcessingCountResultDTO> resiProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : resiProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null!=gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }
@@ -145,7 +151,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkGroupProcessing(String gridId, List<GridProcessingCountResultDTO> groupProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : groupProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null!=gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.34
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.35
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.34</version>
+    <version>0.3.35</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.9
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>

epmet-module/resi-group/resi-group-server/pom.xml

@@ -124,7 +124,7 @@
                 <spring.datasource.druid.username>epmet_resi_group_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.index>1</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
@@ -154,7 +154,7 @@
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.index>1</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>