reddot接口修改

epmet-module/gov-grid/gov-grid-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-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java

@@ -166,7 +166,7 @@ public interface ResiPartymemberFeignClient {
 	 * @Description 查询网格下待审核的党员数
 	 * @Date 2020/5/13 15:41
 	 **/
-	@PostMapping(value = "/resi/partymember/partymemberbaseinfo/getworkgrassrootspartyauth",consumes = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/resi/partymember/partymemberinfo/getworkgrassrootspartyauth",consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<GridProcessingCountResultDTO>> queryPartyMemberProcessingCount(@RequestBody List<String> gridIdList);
 
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java

@@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -16,7 +17,7 @@ import java.util.List;
 @Component
 public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     @Override
-    public Result queryVotingIssueCount(List<String> gridIdList) {
+    public Result<List<GridProcessingCountResultDTO>> queryVotingIssueCount(List<String> gridIdList) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryVotingIssueCount", gridIdList);
     }
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java

@@ -52,18 +52,19 @@ public class RemindServiceImpl implements RemindService {
         Result<List<CustomerGridByUserIdResultDTO>> govOrgResult = govOrgFeignClient.getMyGrids(formDTO.getStaffId());
         if (!govOrgResult.success()) {
             logger.error(String.format("调用gov-org-server服务查询工作人员网格列表失败返回结果", govOrgResult.toString()));
-        }
+        }else{
-        List<CustomerGridByUserIdResultDTO> gridList = govOrgResult.getData();
+            List<CustomerGridByUserIdResultDTO> gridList = govOrgResult.getData();
-        for (CustomerGridByUserIdResultDTO gridInfo : gridList) {
+            for (CustomerGridByUserIdResultDTO gridInfo : gridList) {
-            if(formDTO.getGridId().equals(gridInfo)){
+                if(formDTO.getGridId().equals(gridInfo)){
-                //查询非当前网格的
+                    //查询非当前网格的
-                break;
+                    break;
-            }
+                }
-            //其他网格，只要存在有待办事项的网格，就需要在工作首页网格名称后面显示红点
+                //其他网格，只要存在有待办事项的网格，就需要在工作首页网格名称后面显示红点
-            List<String> functionList = this.getRedDotFunctionList(gridInfo.getGridId());
+                List<String> functionList = this.getRedDotFunctionList(gridInfo.getGridId());
-            if (null != functionList && functionList.size() > 0) {
+                if (null != functionList && functionList.size() > 0) {
-                redDotResultDTO.setOtherGridRedDot(true);
+                    redDotResultDTO.setOtherGridRedDot(true);
-                break;
+                    break;
+                }
             }
         }
         return redDotResultDTO;
@@ -80,10 +81,10 @@ public class RemindServiceImpl implements RemindService {
         if (this.getWorkGrassRootsResi(gridIdList)) {
             functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_RESI);
         }
-        if (getWorkGrassRootsPartyAuth(gridIdList)) {
+        if (this.getWorkGrassRootsPartyAuth(gridIdList)) {
             functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_PARTYAUTH);
         }
-        if (getWorkGrassRootsIssue(gridIdList)) {
+        if (this.getWorkGrassRootsIssue(gridIdList)) {
             functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE);
         }
         return functionList;
@@ -101,9 +102,10 @@ public class RemindServiceImpl implements RemindService {
                     }
                 }
             }
+        }else{
+            logger.error(String.format("调用%s服务,查询网格%s待审核小组数失败code%s,msg:", ServiceConstant.RESI_GROUP_SERVER, gridIdList.get(0), groupProcessingCountResult.getCode(),
+                    groupProcessingCountResult.getMsg()));
         }
-        logger.error(String.format("调用%s服务,查询网格%s待审核小组数失败code%s,msg:", ServiceConstant.RESI_GROUP_SERVER, gridIdList.get(0), groupProcessingCountResult.getCode(),
-                groupProcessingCountResult.getMsg()));
         return false;
     }
 
@@ -119,9 +121,10 @@ public class RemindServiceImpl implements RemindService {
                     }
                 }
             }
+        } else {
+            logger.error(String.format("调用%s服务,查询网格%s待审核热心居民数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), resiGroupProcessingCountResult.getCode(),
+                    resiGroupProcessingCountResult.getMsg()));
         }
-        logger.error(String.format("调用%s服务,查询网格%s待审核热心居民数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), resiGroupProcessingCountResult.getCode(),
-                resiGroupProcessingCountResult.getMsg()));
         return false;
     }
 
@@ -137,9 +140,10 @@ public class RemindServiceImpl implements RemindService {
                     }
                 }
             }
+        }else{
+            logger.error(String.format("调用%s服务,查询网格%s待审核党员数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), partyMemberProcessingCountResult.getCode(),
+                    partyMemberProcessingCountResult.getMsg()));
         }
-        logger.error(String.format("调用%s服务,查询网格%s待审核党员数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), partyMemberProcessingCountResult.getCode(),
-                partyMemberProcessingCountResult.getMsg()));
         return false;
     }
 
@@ -155,9 +159,10 @@ public class RemindServiceImpl implements RemindService {
                     }
                 }
             }
+        }else{
+            logger.error(String.format("调用%s服务,查询网格%s表决中议题总数失败code%s,msg:", ServiceConstant.GOV_ISSUE_SERVER, gridIdList.get(0), issueResult.getCode(),
+                    issueResult.getMsg()));
         }
-        logger.error(String.format("调用%s服务,查询网格%s表决中议题总数失败code%s,msg:", ServiceConstant.GOV_ISSUE_SERVER, gridIdList.get(0), issueResult.getCode(),
-                issueResult.getMsg()));
         return false;
     }
 

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridVotingIssueCountResultDTO.java

@@ -19,6 +19,6 @@ public class GridVotingIssueCountResultDTO implements Serializable {
     /**
      * 表决中的议题总数
      */
-    private Long count;
+    private Integer count;
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/GovIssueRedis.java

@@ -65,11 +65,11 @@ public class GovIssueRedis {
      * @Description 获取某网格下表决中的议题总数
      * @Date 2020/5/14 9:40
      **/
-    public Long queryVotingIssueCount(String gridId) {
+    public Integer queryVotingIssueCount(String gridId) {
-        Long auditingGroupCount = 0L;
+        Integer auditingGroupCount = 0;
         try {
             String workGrassrootsGroupRedDotKey = GovIssueRedisKeys.getWorkGrassrootsIssueRedDotKey(gridId);
-            auditingGroupCount = (Long) redisUtils.get(workGrassrootsGroupRedDotKey);
+            auditingGroupCount = (Integer) redisUtils.get(workGrassrootsGroupRedDotKey);
         } catch (Exception e) {
             logger.error(String.format("网格id%s,查询网格下表决中议题总数异常%s", gridId, e.getMessage()));
             e.printStackTrace();

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

@@ -258,9 +258,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 		for (String gridId : gridIdList) {
 			GridVotingIssueCountResultDTO gridVotingIssueCountResultDTO = new GridVotingIssueCountResultDTO();
 			gridVotingIssueCountResultDTO.setGridId(gridId);
-			Long auditingCount = govIssueRedis.queryVotingIssueCount(gridId);
+			Integer auditingCount = govIssueRedis.queryVotingIssueCount(gridId);
 			if (null == auditingCount) {
-				gridVotingIssueCountResultDTO.setCount(0L);
+				gridVotingIssueCountResultDTO.setCount(0);
 			} else {
 				gridVotingIssueCountResultDTO.setCount(auditingCount);
 			}

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

@@ -35,7 +35,7 @@ public interface ResiPartymemberFeignClient {
 	 * @Description 查询网格下待审核的党员数
 	 * @Date 2020/5/13 15:41
 	 **/
-	@PostMapping(value = "/resi/partymember/partymemberbaseinfo/getworkgrassrootspartyauth",consumes = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/resi/partymember/partymemberinfo/getworkgrassrootspartyauth",consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<GridProcessingCountResultDTO>> queryPartyMemberProcessingCount(@RequestBody List<String> gridIdList);
 
 }

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

@@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -16,7 +17,7 @@ import java.util.List;
 @Component
 public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     @Override
-    public Result queryVotingIssueCount(List<String> gridIdList) {
+    public Result<List<GridProcessingCountResultDTO>> queryVotingIssueCount(List<String> gridIdList) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryVotingIssueCount", gridIdList);
     }
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/GroupProcessingCountResultDTO.java

@@ -20,6 +20,6 @@ public class GroupProcessingCountResultDTO implements Serializable {
     /**
      * 待审核的小组总数
      */
-    private Long count;
+    private Integer count;
 }
 

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

@@ -82,6 +82,12 @@
             <version>2.0.0</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/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@@ -195,11 +195,11 @@ public class ResiGroupRedis {
      * @Description 获取某网格下待审核小组总数
      * @Date 2020/5/13 21:40
      **/
-    public Long getWorkGrassrootsGroupRedDotValue(String gridId) {
+    public Integer getWorkGrassrootsGroupRedDotValue(String gridId) {
-        Long auditingGroupCount = 0L;
+        Integer auditingGroupCount = 0;
         try {
             String workGrassrootsGroupRedDotKey = ResiGroupRedisKeys.getWorkGrassrootsGroupRedDotKey(gridId);
-            auditingGroupCount = (Long) redisUtils.get(workGrassrootsGroupRedDotKey);
+            auditingGroupCount = (Integer) redisUtils.get(workGrassrootsGroupRedDotKey);
         } catch (Exception e) {
             logger.error(String.format("网格id%s,查询网格下待审核小组总数异常%s", gridId, e.getMessage()));
             e.printStackTrace();

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -790,9 +790,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		for(String gridId:gridIdList){
 			GroupProcessingCountResultDTO resultDTO=new GroupProcessingCountResultDTO();
 			resultDTO.setGridId(gridId);
-			Long auditingCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
+			Integer auditingCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
 			if (null == auditingCount) {
-				resultDTO.setCount(0L);
+				resultDTO.setCount(0);
 			} else {
 				resultDTO.setCount(auditingCount);
 			}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyAuthProcessingCountResultDTO.java

@@ -20,6 +20,6 @@ public class PartyAuthProcessingCountResultDTO implements Serializable {
     /**
      * 待审核党员申请总数
      */
-    private Long count;
+    private Integer count;
 }
 

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiProcessingCountResultDTO.java

@@ -20,6 +20,6 @@ public class ResiProcessingCountResultDTO implements Serializable {
     /**
      * 待审核党员申请总数
      */
-    private Long count;
+    private Integer count;
 }
 

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

@@ -208,9 +208,9 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		for (String gridId : gridIdList) {
 			PartyAuthProcessingCountResultDTO partyAuthProcessingCountResultDTO = new PartyAuthProcessingCountResultDTO();
 			partyAuthProcessingCountResultDTO.setGridId(gridId);
-			Long auditingPartyMember = resiPartyMemberRedis.queryPartyAuthProcessingCount(gridId);
+			Integer auditingPartyMember = resiPartyMemberRedis.queryPartyAuthProcessingCount(gridId);
 			if (null == auditingPartyMember) {
-				partyAuthProcessingCountResultDTO.setCount(0L);
+				partyAuthProcessingCountResultDTO.setCount(0);
 			} else {
 				partyAuthProcessingCountResultDTO.setCount(auditingPartyMember);
 			}

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

@@ -505,9 +505,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		for (String gridId : gridIdList) {
 			ResiProcessingCountResultDTO resiProcessingCountResultDTO = new ResiProcessingCountResultDTO();
 			resiProcessingCountResultDTO.setGridId(gridId);
-			Long auditingResi = resiPartyMemberRedis.queryResiProcessingCount(gridId);
+			Integer auditingResi = resiPartyMemberRedis.queryResiProcessingCount(gridId);
 			if (null == auditingResi) {
-				resiProcessingCountResultDTO.setCount(0L);
+				resiProcessingCountResultDTO.setCount(0);
 			} else {
 				resiProcessingCountResultDTO.setCount(auditingResi);
 			}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java

@@ -135,11 +135,11 @@ public class ResiPartyMemberRedis {
      * @Description 查询网格下待审核热心居民总数
      * @Date 2020/5/13 22:44
      **/
-    public Long queryResiProcessingCount(String gridId) {
+    public Integer queryResiProcessingCount(String gridId) {
-        Long auditingResiWarmHeartedCount = 0L;
+        Integer auditingResiWarmHeartedCount = 0;
         try {
             String workGrassrootsResiRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsResiRedDotKey(gridId);
-            auditingResiWarmHeartedCount = (Long) redisUtils.get(workGrassrootsResiRedDotKey);
+            auditingResiWarmHeartedCount = (Integer) redisUtils.get(workGrassrootsResiRedDotKey);
         } catch (Exception e) {
             logger.error(String.format("网格id%s,查询网格下待审核热心居民总数异常%s", gridId, e.getMessage()));
             e.printStackTrace();
@@ -154,11 +154,11 @@ public class ResiPartyMemberRedis {
      * @Description 查询网格下待审核党员总数
      * @Date 2020/5/13 22:44
      **/
-    public Long queryPartyAuthProcessingCount(String gridId) {
+    public Integer queryPartyAuthProcessingCount(String gridId) {
-        Long auditingParyMember = 0L;
+        Integer auditingParyMember = 0;
         try {
             String workGrassrootsResiRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsPartyAuthRedDotKey(gridId);
-            auditingParyMember = (Long) redisUtils.get(workGrassrootsResiRedDotKey);
+            auditingParyMember = (Integer) redisUtils.get(workGrassrootsResiRedDotKey);
         } catch (Exception e) {
             logger.error(String.format("网格id%s,查询网格下待审核党员总数异常%s", gridId, e.getMessage()));
             e.printStackTrace();