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

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.16
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.17
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/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.16</version>
+    <version>0.3.17</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -19,7 +20,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.redis.CaptchaRedis;
@@ -50,8 +50,6 @@ public class GovLoginServiceImpl implements GovLoginService {
     @Autowired
     private CaptchaRedis captchaRedis;
     @Autowired
-    private MessageFeignClient messageFeignClient;
-    @Autowired
     private JwtTokenUtils jwtTokenUtils;
     @Autowired
     private JwtTokenProperties jwtTokenProperties;
@@ -178,7 +176,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         govTokenDto.setGridIdList(getGridIdList(staffLatestAgency.getStaffId()));
         CustomerAgencyDTO agency = getAgencyByStaffId(staffLatestAgency.getStaffId());
         if (agency != null) {
-            govTokenDto.setRoleIdList(queryGovStaffRoleIds(staffLatestAgency.getStaffId(), agency.getId()));
+            govTokenDto.setRoleList(queryGovStaffRoles(staffLatestAgency.getStaffId(), agency.getId()));
         }
         govTokenDto.setOrgIdPath(getOrgIdPath(staffLatestAgency.getStaffId()));
 
@@ -192,13 +190,14 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @param orgId
      * @return
      */
-    public Set<String> queryGovStaffRoleIds(String staffId, String orgId) {
+    public List<GovTokenDto.Role> queryGovStaffRoles(String staffId, String orgId) {
         StaffRoleFormDTO formDTO = new StaffRoleFormDTO();
         formDTO.setStaffId(staffId);
         formDTO.setOrgId(orgId);
         Result<List<GovStaffRoleDTO>> gridResult = epmetUserFeignClient.getRolesOfStaff(formDTO);
         if (!CollectionUtils.isEmpty(gridResult.getData())) {
-            return gridResult.getData().stream().map(role -> role.getId()).collect(Collectors.toSet());
+            //return gridResult.getData().stream().map(role -> role.getId()).collect(Collectors.toSet());
+            return ConvertUtils.sourceToTarget(gridResult.getData(), GovTokenDto.Role.class);
         }
         return null;
     }
@@ -355,7 +354,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         govTokenDto.setGridIdList(getGridIdList(staffId));
         CustomerAgencyDTO agency = getAgencyByStaffId(staffId);
         if (agency != null) {
-            govTokenDto.setRoleIdList(queryGovStaffRoleIds(staffId, agency.getId()));
+            govTokenDto.setRoleList(queryGovStaffRoles(staffId, agency.getId()));
         }
         govTokenDto.setOrgIdPath(getOrgIdPath(staffId));
 

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
@@ -17,7 +16,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.OperAccessFeignClient;
+import com.epmet.feign.OperAccessOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.service.CaptchaService;
@@ -63,7 +62,7 @@ public class LoginServiceImpl implements LoginService {
 	private CaptchaService captchaService;
 
 	@Autowired
-	private OperAccessFeignClient operAccessFeignClient;
+	private OperAccessOpenFeignClient operAccessOpenFeignClient;
 
 	/**
 	 * 居民端微信小程序登录
@@ -321,7 +320,7 @@ public class LoginServiceImpl implements LoginService {
 		}
 		cpUserDetailRedis.logout(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
 		//web端清空菜单栏和权限
-		Result operAccessResult = operAccessFeignClient.clearOperUserAccess();
+		Result operAccessResult = operAccessOpenFeignClient.clearOperUserAccess();
 		if (operAccessResult.success()) {
 			logger.info(String.format("运营人员%s退出成功,清空菜单和权限redis成功", tokenDto.getUserId()));
 		} else {

epmet-auth/src/test/java/com/epmet/TokenGenTest.java

@@ -78,7 +78,7 @@ public class TokenGenTest {
         govTokenDto.setGridIdList(govLoginService.getGridIdList(staffId));
         CustomerAgencyDTO agency = govLoginService.getAgencyByStaffId(staffId);
         if (agency != null) {
-            govTokenDto.setRoleIdList(govLoginService.queryGovStaffRoleIds(staffId, agency.getId()));
+            govTokenDto.setRoleList(govLoginService.queryGovStaffRoles(staffId, agency.getId()));
         }
         govTokenDto.setOrgIdPath(govLoginService.getOrgIdPath(staffId));
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -77,7 +79,18 @@ public class GovTokenDto extends BaseTokenDto implements Serializable {
     /**
      * 角色ID列表
      */
-    private Set<String> roleIdList;
+    private List<Role> roleList;
+
+    @Data
+    public static class Role {
+
+        private String id;
+        private String roleKey;
+        private String roleName;
+
+        public Role() {
+        }
+    }
 
     @Override
     public String toString() {

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java

@@ -34,8 +34,8 @@ import com.epmet.dto.form.SaveCustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.DemoEntity;
 import com.epmet.feign.AdminFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.DemoRedis;
 import com.epmet.service.DemoService;
@@ -70,7 +70,7 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
     @Autowired
     private AdminFeignClient adminFeignClient;
     @Autowired
-    private MessageFeignClient messageFeignClient;
+    private EpmetMessageOpenFeignClient messageFeignClient;
 
     @Override
     public PageData<DemoDTO> page(Map<String, Object> params) {

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java → epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -1,10 +1,5 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.SysSmsDTO;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.feign.fallback.MessageFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,9 +7,20 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
+import com.epmet.commons.tools.constant.ServiceConstant;
-public interface MessageFeignClient {
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.SysSmsDTO;
+import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.feign.fallback.EpmetMessageOpenFeignClientFallback;
 
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:47
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class)
+public interface EpmetMessageOpenFeignClient {
     /**
      * 发送短信
      * @return
@@ -37,5 +43,5 @@ public interface MessageFeignClient {
      * @Date 2020/4/7 15:36
      **/
     @PostMapping(value = "message/usermessage/saveusermessage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result saveUserMessage(UserMessageFormDTO formDto);
+    Result saveUserMessage(@RequestBody UserMessageFormDTO formDto);
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java → epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@@ -1,19 +1,22 @@
 package com.epmet.feign.fallback;
 
+import org.springframework.stereotype.Component;
+
 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.SysSmsDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 /**
- * 消息服务降级
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:48
  */
 @Component
-public class MessageFeignClientFallback implements MessageFeignClient {
+public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeignClient {
-
 
     @Override
     public Result send(SysSmsDTO smsDTO) {
@@ -29,5 +32,4 @@ public class MessageFeignClientFallback implements MessageFeignClient {
     public Result saveUserMessage(UserMessageFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessage", formDto);
     }
-
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@@ -22,7 +22,7 @@ import com.epmet.dao.SysSmsDao;
 import com.epmet.dto.SysSmsDTO;
 import com.epmet.entity.SysSmsEntity;
 import com.epmet.exception.ModuleErrorCode;
-import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.service.SysSmsService;
 import com.epmet.sms.AbstractSmsService;
 import com.epmet.sms.SmsFactory;
@@ -34,7 +34,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @Service
 public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity> implements SysSmsService {
@@ -42,7 +44,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private MessageFeignClient messageFeignClient;
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<SysSmsDTO> page(Map<String, Object> params) {
@@ -125,7 +127,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
             sysSmsDTO.setMobile(mobile);
             sysSmsDTO.setParams(paramJson);
 
-            Result result = messageFeignClient.send(sysSmsDTO);
+            Result result = epmetMessageOpenFeignClient.send(sysSmsDTO);
             if (result != null && result.success()) {
                 HashMap<String, String> data = new HashMap<>();
                 data.put("code", codeStr);

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.security.dto.GovTokenDto;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Set;
 
 @Data
@@ -25,7 +27,8 @@ public class LoginUserDetailsResultDTO {
     /**
      * 角色列表
      */
-    private Set<String> roleIdList;
+    //private Set<String> roleIdList;
+    private List<GovTokenDto.Role> roleList;
 
     /**
      * 部门id列表

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java → epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java

@@ -1,9 +1,9 @@
-package com.epmet.dto.feign;
+package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.feign.fallback.GovAccessFeignClientFallBack;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import com.epmet.feign.fallback.GovAccessFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/fallback/GovAccessFeignClientFallBack.java → epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java

@@ -1,10 +1,10 @@
-package com.epmet.dto.feign.fallback;
+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.feign.GovAccessFeignClient;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import com.epmet.feign.GovAccessFeignClient;
 import org.springframework.stereotype.Component;
 
 /**

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.25
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-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.23</version>
+    <version>0.3.25</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -5,6 +5,7 @@ import com.epmet.bean.OpeScopeFilterResultBean;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
@@ -89,15 +90,15 @@ public class AccessServiceImpl implements AccessService {
         if (userDetails == null) {
             return false;
         }
-        Set<String> roleIdList = userDetails.getRoleIdList();
+        List<GovTokenDto.Role> roleList = userDetails.getRoleList();
-        if (CollectionUtils.isEmpty(roleIdList)) {
+        if (CollectionUtils.isEmpty(roleList)) {
             return false;
         }
 
         final Set<String> operationKeys = new HashSet<>();
 
-        roleIdList.stream().forEach(roleId -> {
+        roleList.stream().forEach(role -> {
-            List<RoleOpeScopeResultDTO> opeAndScopes = listAllRoleOperationScopesByRoleId(roleId);
+            List<RoleOpeScopeResultDTO> opeAndScopes = listAllRoleOperationScopesByRoleId(role.getId());
             operationKeys.addAll(opeAndScopes.stream().map(opeAndScope -> opeAndScope.getOperationKey()).collect(Collectors.toSet()));
         });
 
@@ -118,12 +119,12 @@ public class AccessServiceImpl implements AccessService {
 
         StringBuilder sb = new StringBuilder();
 
-        if (CollectionUtils.isEmpty(userDetails.getRoleIdList())) {
+        if (CollectionUtils.isEmpty(userDetails.getRoleList())) {
             //logger.warn("用户{}没有配置任何角色，无法执行{}操作", form.getUserId(), form.getOperationKey());
             throw new RenException(String.format("用户%s没有配置任何角色，无法执行%s操作", form.getUserId(), form.getOperationKey()));
         }
 
-        OpeScopeFilterResultBean effectiveOpeScopes = getEffectiveOpeScopes(userDetails.getRoleIdList(), form.getOperationKey());
+        OpeScopeFilterResultBean effectiveOpeScopes = getEffectiveOpeScopes(userDetails.getRoleList(), form.getOperationKey());
         if (effectiveOpeScopes.isAllScopes()) {
             return sb.toString();
         }
@@ -235,12 +236,12 @@ public class AccessServiceImpl implements AccessService {
     /**
      * 计算有效操作范围
      */
-    public OpeScopeFilterResultBean getEffectiveOpeScopes(Set<String> roleIds, String reqiurePermission) {
+    public OpeScopeFilterResultBean getEffectiveOpeScopes(List<GovTokenDto.Role> roles, String reqiurePermission) {
 
         // 根据角色列表查询操作范围列表
         Set<RoleOpeScopeResultDTO> opeAndScopesOfThisOperation = new HashSet<>();
-        roleIds.forEach(roleId -> {
+        roles.forEach(role -> {
-            List<RoleOpeScopeResultDTO> opes = listAllRoleOperationScopesByRoleId(roleId);
+            List<RoleOpeScopeResultDTO> opes = listAllRoleOperationScopesByRoleId(role.getId());
             if (!CollectionUtils.isEmpty(opes)) {
                 opes.forEach(ope -> {
                     if (reqiurePermission.equals(ope.getOperationKey())) {
@@ -441,7 +442,7 @@ public class AccessServiceImpl implements AccessService {
         // 获取机关单位中的角色
         // 目前一个人只在一个单位下，所以不动态查询，如果后面需要一个人在多个单位，再改这里
         //List<GovStaffRoleDTO> roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId());
-        Set<String> roleIdList = userDetails.getRoleIdList();
+        List<GovTokenDto.Role> roleList = userDetails.getRoleList();
 
         // 当前组织和所属组织的orgId路径,以及他们的上下级关系
         String belongOrgIdPath = getOrgIdPath(belongAgency);
@@ -450,9 +451,9 @@ public class AccessServiceImpl implements AccessService {
 
         Set<String> filtedOps = new HashSet<>();
 
-        if (!CollectionUtils.isEmpty(roleIdList)) {
+        if (!CollectionUtils.isEmpty(roleList)) {
-            roleIdList.forEach(roleId -> {
+            roleList.forEach(role -> {
-                List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleId);
+                List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(role.getId());
                 filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO));
             });
         }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:37
+ */
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
+public interface GovIssueOpenFeignClient {
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovIssueOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:43
+ */
+@Component
+public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient {
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -1,34 +0,0 @@
-package com.epmet.feign;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.LatestCustomerResultDTO;
-import com.epmet.dto.result.MineResultDTO;
-import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @Description url = "localhost:8092"
- * @Author sun
- */
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
-public interface GovOrgFeignClient {
-
-    /**
-     * 根据staffId查询所属的组织机构
-     * @param staffId
-     * @return
-     */
-    @PostMapping("/gov/org/agency/agencybystaff/{staffId}")
-    Result<CustomerAgencyDTO> getAgencyByStaff(@PathVariable("staffId") String staffId);
-}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -1,23 +1,40 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.feign.callback.GovOrgOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
-//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url = "localhost:8092")
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:37
+ */
+// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url =
+// "localhost:8092")
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class)
 public interface GovOrgOpenFeignClient {
 
     /**
      * 根据Id查询agency
+     * 
      * @param agencyId
      * @return
      */
     @PostMapping("/gov/org/agency/agencybyid/{agencyId}")
     Result<CustomerAgencyDTO> getAgencyById(@PathVariable("agencyId") String agencyId);
 
+    /**
+     * 根据staffId查询所属的组织机构
+     * 
+     * @param staffId
+     * @return
+     */
+    @PostMapping("/gov/org/agency/agencybystaff/{staffId}")
+    Result<CustomerAgencyDTO> getAgencyByStaff(@PathVariable("staffId") String staffId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -1,27 +0,0 @@
-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.CustomerAgencyDTO;
-import com.epmet.dto.form.LatestGridFormDTO;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.LatestCustomerResultDTO;
-import com.epmet.dto.result.MineResultDTO;
-import com.epmet.feign.GovOrgFeignClient;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author sun
- */
-@Component
-public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
-    @Override
-    public Result<CustomerAgencyDTO> getAgencyByStaff(String staffId) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaff", staffId);
-    }
-}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/callback/GovOrgOpenFeignClientFallback.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -1,4 +1,4 @@
-package com.epmet.feign.callback;
+package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
@@ -7,10 +7,21 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:37
+ */
 @Component
 public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     @Override
     public Result<CustomerAgencyDTO> getAgencyById(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getAgencyById", agencyId);
     }
+
+    @Override
+    public Result<CustomerAgencyDTO> getAgencyByStaff(String staffId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaff", staffId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java

@@ -42,6 +42,11 @@ public class CustomerAgencyRedis {
 
     }
 
+    public void delete(String agencyId) {
+        String key = RedisKeys.getAgencyByIdKey(agencyId);
+        redisUtils.delete(key);
+    }
+
     public void set(String agencyId, CustomerAgencyDTO value){
         String key = RedisKeys.getAgencyByIdKey(agencyId);
         Map<String, Object> map = BeanUtil.beanToMap(value, false, true);

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

@@ -151,6 +151,9 @@ public class AgencyServiceImpl implements AgencyService {
             log.error(CustomerAgencyConstant.UPDATE_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.UPDATE_EXCEPTION);
         }
+
+        //5.redis缓存
+        customerAgencyRedis.delete(formDTO.getAgencyId());
         return result;
     }
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:32
+ */
+@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectOpenFeignClientFallback.class)
+public interface GovProjectOpenFeignClient {
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovProjectOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:33
+ */
+@Component
+public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignClient {
+}

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

@@ -32,7 +32,6 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -41,7 +40,6 @@ import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
@@ -52,7 +50,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java

@@ -0,0 +1,18 @@
+package com.epmet.feign;
+
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.dto.feign.fallback.GovVoiceFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 16:01
+ */
+@FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceFeignClientFallBack.class)
+public interface GovVoiceOpenFeignClient {
+
+
+}

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClientFallback.java

@@ -0,0 +1,13 @@
+package com.epmet.feign;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 16:01
+ */
+@Component
+public class GovVoiceOpenFeignClientFallback implements GovVoiceOpenFeignClient{
+}

epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java → epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessOpenFeignClient.java

@@ -1,19 +1,20 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.feign.fallback.OperAccessFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.OperAccessOpenFeignClientFallback;
+
 /**
  * @Description 运营端权限模块
  * @Author yinzuomei
- * @Date 2020/5/21 15:17
+ * @Date 2020/5/21 15:17 本服务对外开放的API,其他服务通过引用此client调用该服务
  */
-//, url = "http://localhost:8093"
+// , url = "http://localhost:8093"
-@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperAccessFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperAccessOpenFeignClientFallback.class)
-public interface OperAccessFeignClient {
+public interface OperAccessOpenFeignClient {
     /**
      * @param
      * @return com.epmet.commons.tools.utils.Result

epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java → epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessOpenFeignClientFallback.java

@@ -3,7 +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.feign.OperAccessFeignClient;
+import com.epmet.feign.OperAccessOpenFeignClient;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @Date 2020/5/21 15:47
  */
 @Component
-public class OperAccessFeignClientFallback implements OperAccessFeignClient {
+public class OperAccessOpenFeignClientFallback implements OperAccessOpenFeignClient {
     @Override
     public Result clearOperUserAccess() {
         return ModuleUtils.feignConError(ServiceConstant.OPER_ACCESS_SERVER, "clearOperUserAccess");

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.OperCrmOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:25
+ */
+@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmOpenFeignClientFallback.class)
+public interface OperCrmOpenFeignClient {
+}

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.OperCrmOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:26
+ */
+@Component
+public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient {
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -0,0 +1,17 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:16
+ */
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeOpenFeignClientFallback.class)
+public interface OperCustomizeOpenFeignClient {
+
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.OperCustomizeOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:23
+ */
+@Component
+public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFeignClient {
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.group.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:16
+ */
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class)
+public interface ResiGroupOpenFeignClient {
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.resi.group.feign.fallback;
+
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:17
+ */
+@Component
+public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClient {
+}

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

@@ -33,8 +33,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.ResiGuideFeignClient;
@@ -96,7 +95,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	private GroupMemeberOperationService groupMemeberOperationService;
 
 	@Autowired
-	private MessageFeignClient messageFeignClient;
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 	@Autowired
 	private ResiGroupDao resiGroupDao;
 
@@ -436,7 +435,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 		//通知群主
 		userMessage.setUserId(groupInvitationDTO.getInviterUserId());
-		Result result = messageFeignClient.saveUserMessage(userMessage);
+		Result result = epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 		if (result.success()) {
 			logger.info("通知群主有新成员入群成功");
 		} else {

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

@@ -35,7 +35,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -69,7 +69,6 @@ import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import com.epmet.resi.group.dto.member.result.VotableCountResultDTO;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +102,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	private EpmetUserFeignClient epmetUserFeignClient;
 
 	@Autowired
-	private MessageFeignClient messageFeignClient;
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 	@Autowired
 	private ResiGroupStatisticalService resiGroupStatisticalService;
@@ -270,7 +269,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 			//通知群主
 			userMessage.setUserId(groupLeader.getCustomerUserId());
-			messageFeignClient.saveUserMessage(userMessage);
+			epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 		} catch (Exception e) {
 			logger.error("居民申请入群，给组长发送消息通知异常");
 			e.printStackTrace();
@@ -445,7 +444,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 		//通知群主
 		userMessage.setUserId(resiGroupMemberDTO.getCustomerUserId());
-		messageFeignClient.saveUserMessage(userMessage);
+		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 	}
 
 	/**
@@ -510,7 +509,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 		//通知群主
 		userMessage.setUserId(groupMemeberOperationDTO.getCustomerUserId());
-		messageFeignClient.saveUserMessage(userMessage);
+		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 	}
 
     /**
@@ -597,7 +596,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		String messageContent=String.format(UserMessageConstant.SLIENT_IN_GROUP, dateStr);
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
-		messageFeignClient.saveUserMessage(userMessageFormDTO);
+		epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO);
 		result.setMsg(GroupMemberConstant.SLIENT_SUCCESS);
         return result;
     }
@@ -625,8 +624,9 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 **/
 	@Override
 	public GridVotableCountResultDTO votableCount(CommonGridIdListFormDTO gridList) {
-		if(null == gridList || null == gridList.getGridIds() || gridList.getGridIds().size() < NumConstant.ONE)
+		if(null == gridList || null == gridList.getGridIds() || gridList.getGridIds().size() < NumConstant.ONE){
 			return null;
+		}
 		GridVotableCountResultDTO result = new GridVotableCountResultDTO();
 		Map<String,Integer> votableCountMap = new HashMap<>();
 		gridList.getGridIds().forEach(gridId -> {

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.partymember.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:12
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartyMemberOpenFeignClientFallback.class)
+public interface ResiPartyMemberOpenFeignClient {
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.resi.partymember.feign.fallback;
+
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:14
+ */
+@Component
+public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOpenFeignClient {
+}

epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/ResiVoiceOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.ResiVoiceOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:01
+ */
+@FeignClient(name = ServiceConstant.RESI_VOICE_SERVER, fallback = ResiVoiceOpenFeignClientFallback.class)
+public interface ResiVoiceOpenFeignClient {
+}

epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/fallback/ResiVoiceOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.ResiVoiceOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:05
+ */
+@Component
+public class ResiVoiceOpenFeignClientFallback implements ResiVoiceOpenFeignClient {
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:09
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+public interface EpmetUserOpenFeignClient {
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:10
+ */
+@Component
+public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClient {
+}

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.55
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.56
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-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.55</version>
+    <version>0.3.56</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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

@@ -28,10 +28,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.GovStaffRoleDao;
 import com.epmet.dao.GovStaffRoleTemplateDao;
 import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.feign.GovAccessFeignClient;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.entity.GovStaffRoleEntity;
+import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.redis.GovStaffRoleRedis;
 import com.epmet.service.GovStaffRoleService;
 import org.apache.commons.lang3.StringUtils;