From d3542a1d2d875db6e805756ee19241655dd349c5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 11 Oct 2022 13:50:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CollectDetailResultDTO.java | 3 +++ .../epmet/dto/result/OrgInfoResultDTO.java | 23 +++++++++++++++++++ .../impl/IcResiCollectServiceImpl.java | 11 +++++++++ 3 files changed, 37 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java index 8a71aa8ea9..2631a14625 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.dto.result.OrgInfoResultDTO; import lombok.Data; import java.io.Serializable; @@ -75,4 +76,6 @@ public class CollectDetailResultDTO implements Serializable { private List memberList; private String orgIdPath; + + private List orgIdPathList; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java new file mode 100644 index 0000000000..0905a073b7 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/10/11 13:41 + * @DESC + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class OrgInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 7478605833438304330L; + + private String id; + private String name; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 3d2cfd552b..18c38f5407 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -225,6 +225,17 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl orgInfoList = new ArrayList<>(); + for (String orgId : split) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + if (null == agencyInfo){ + throw new EpmetException("查询组织信息失败："+orgId); + } + OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName()); + orgInfoList.add(orgInfoResultDTO); + } + result.setOrgIdPathList(orgInfoList); //查询成员信息 List memberList = icResiMemberDao.selectListByCollectId(dto.getId()); result.setMemberList(memberList); From c79cd9cc4cd0160e7944c3d8f88e939a70e1ef1a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 14:19:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9ErealNam?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/ResiDingAppLoginResDTO.java | 2 ++ .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java b/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java index 7a0517574a..6658ab5770 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java @@ -38,5 +38,7 @@ public class ResiDingAppLoginResDTO { * false:未注册 */ private Boolean regFlag; + + private String realName; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index e1ab790e0f..c7c79bb575 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -1029,14 +1029,13 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol public ResiDingAppLoginResDTO resiLoginInternalDing(DingAppLoginMdFormDTO formDTO) { // 获取用户手机号 log.info("1、钉钉居民端应用登录入参:" + JSON.toJSONString(formDTO)); - ResiDingAppLoginResDTO resDTO = null; - resDTO = new ResiDingAppLoginResDTO(); + ResiDingAppLoginResDTO resDTO = new ResiDingAppLoginResDTO(); resDTO.setCustomerId(getCurrentCustomerId()); // 1、获取用户手机号 DingLoginResiFormDTO dingLoginResiFormDTO = getDingLoginResiFormDTOInternal(formDTO.getMiniAppId(), formDTO.getAuthCode()); dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId()); - + resDTO.setRealName(dingLoginResiFormDTO.getNick()); // 2、调用userfeign接口获取userId、注册网格相关信息 Result loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO); if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) { From d35d033a48e043318d11546c518151dc083fe3c5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Oct 2022 15:21:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=AA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/CollectDetailResultDTO.java | 3 ++- .../{OrgInfoResultDTO.java => OrgInfoIdAndNameResultDTO.java} | 2 +- .../java/com/epmet/service/impl/IcResiCollectServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) rename epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/{OrgInfoResultDTO.java => OrgInfoIdAndNameResultDTO.java} (85%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java index 2631a14625..5a6d58d685 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.dto.result.OrgInfoIdAndNameResultDTO; import com.epmet.dto.result.OrgInfoResultDTO; import lombok.Data; @@ -77,5 +78,5 @@ public class CollectDetailResultDTO implements Serializable { private String orgIdPath; - private List orgIdPathList; + private List orgIdPathList; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java similarity index 85% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java index 0905a073b7..53223ed6ad 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -public class OrgInfoResultDTO implements Serializable { +public class OrgInfoIdAndNameResultDTO implements Serializable { private static final long serialVersionUID = 7478605833438304330L; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 18c38f5407..c519210d7b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -226,13 +226,13 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl orgInfoList = new ArrayList<>(); + List orgInfoList = new ArrayList<>(); for (String orgId : split) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); if (null == agencyInfo){ throw new EpmetException("查询组织信息失败："+orgId); } - OrgInfoResultDTO orgInfoResultDTO = new OrgInfoResultDTO(orgId,agencyInfo.getOrganizationName()); + OrgInfoIdAndNameResultDTO orgInfoResultDTO = new OrgInfoIdAndNameResultDTO(orgId,agencyInfo.getOrganizationName()); orgInfoList.add(orgInfoResultDTO); } result.setOrgIdPathList(orgInfoList); From 211bd576fe09570807491c65b176cb0d2771ad6b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 14 Oct 2022 17:09:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8C=BA?= =?UTF-8?q?=E7=BA=A7areaCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AreaCodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index b0f519a3ac..418b3dc251 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -833,7 +833,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl