Merge remote-tracking branch 'remotes/烟台/master' into 烟台-政务master

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/api/yt/YantaiApi.java

@@ -41,7 +41,13 @@ public class YantaiApi {
      * 调用sso后台api接口的 秘钥
      */
     private static final String SSO_API_TOKEN = "iJCDUgCBV/Zk5FkkaxLypA==";
+    /**
+     * 政务网地址
+     */
     private static final String SSO_BACKGROUND_SERVER_URL = "http://172.20.46.155:8082/";
+    /**
+     * 互联网地址
+     */
     //private static final String SSO_BACKGROUND_SERVER_URL = "http://120.220.248.247:8081/";
 
     /**
@@ -101,7 +107,7 @@ public class YantaiApi {
             //加密
             String organizationIdEn = SM4UtilsForYanTai.dealEncryptData(organizationId);
             //pwd = URLEncoder.encode(pwd, "UTF-8");
-            String url = SSO_BACKGROUND_SERVER_URL + "person/serInfo/getUserByOuGuid";
+            String url = SSO_BACKGROUND_SERVER_URL + "person/userInfo/getUserByOuGuid";
 
 
             Map<String, Object> paramMap = new HashMap<>();
@@ -242,9 +248,9 @@ public class YantaiApi {
         List<OrgData> childOuInfoByGuid = getChildOuInfoByGuid(organizationId);
         System.out.println("childOuInfoByGuid:"+JSON.toJSONString(childOuInfoByGuid));
         //先用他说的有人的组织id联调
-        String orgId = "2b271845-ed51-48aa-9935-00b9e7e06311";
-        orgId = "2b271845-ed51-48aa-9935-00b9e7e05778";
-        List<UserData> userByOuGuid = getUserByOuGuid(orgId);
+        //String orgId = "2b271845-ed51-48aa-9935-00b9e7e06311";
+        //orgId = "2b271845-ed51-48aa-9935-00b9e7e05778";
+        List<UserData> userByOuGuid = getUserByOuGuid(organizationId);
         System.out.println("getUserByOuGuid:"+JSON.toJSONString(userByOuGuid));
 
 //        Map<String, Object> apiHeaderMap = getApiHeaderMap();

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.IdAndNameDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -21,6 +22,7 @@ import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.constant.BadgeConstant;
@@ -63,6 +65,11 @@ import com.epmet.dto.result.DetailByTypeResultDTO;
 import com.epmet.dto.result.StaffRoleResultDTO;
 import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.dto.form.GetStaffExistRoleFormDTO;
+import com.epmet.dto.result.NewUserRoleResultDTO;
+import com.epmet.dto.result.StaffRoleResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.GovAccessFeignClient;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -125,6 +132,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private GovAccessFeignClient govAccessFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private GovAccessFeignClient govAccessFeignClient;
 
     /**
      * @Description  根据UserIds查询

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

@@ -933,4 +933,5 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/customerstaff/allCustomerStaffInCache")
     Result allCustomerStaffInCache(@RequestParam("customerId")String customerId);
+
 }