Merge remote-tracking branch 'origin/dev_dingding'

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;
 }
 

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;
+        ResiDingAppLoginResDTO resDTO =  new 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<DingLoginResiResDTO> loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO);
         if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) {

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<AreaCodeDao, AreaCodeEn
     private String addDistrictAreaCode(String cityCode, String countyName) {
         AreaCodeDTO city = baseDao.selectByCityCode(cityCode);
         AreaCodeEntity insert = ConvertUtils.sourceToTarget(city, AreaCodeEntity.class);
-        insert.setCityName(countyName);
+        insert.setCountyName(countyName);
         AreaCodeDTO maxCountyDTO = baseDao.selectMaxCounty(cityCode);
         if (null == maxCountyDTO) {
             insert.setCountyCode(cityCode.concat(AreaCodeConstant.FIRST_TOW_UD));

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java

@@ -1,5 +1,7 @@
 package com.epmet.dto.form;
 
+import com.epmet.dto.result.OrgInfoIdAndNameResultDTO;
+import com.epmet.dto.result.OrgInfoResultDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -75,4 +77,6 @@ public class CollectDetailResultDTO implements Serializable {
     private List<IcResiCollectMemDetailDTO> memberList;
 
     private String orgIdPath;
+
+    private List<OrgInfoIdAndNameResultDTO> orgIdPathList;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OrgInfoIdAndNameResultDTO.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 OrgInfoIdAndNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7478605833438304330L;
+
+    private String id;
+    private String name;
+}

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

@@ -225,6 +225,17 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         }
         CollectDetailResultDTO result = ConvertUtils.sourceToTarget(entity, CollectDetailResultDTO.class);
         result.setOrgIdPath(StringUtils.isBlank(entity.getPids()) ? entity.getAgencyId() : entity.getPids()+":"+entity.getAgencyId());
+        String[] split = result.getOrgIdPath().split(":");
+        List<OrgInfoIdAndNameResultDTO> orgInfoList = new ArrayList<>();
+        for (String orgId : split) {
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId);
+            if (null == agencyInfo){
+                throw new EpmetException("查询组织信息失败："+orgId);
+            }
+            OrgInfoIdAndNameResultDTO orgInfoResultDTO = new OrgInfoIdAndNameResultDTO(orgId,agencyInfo.getOrganizationName());
+            orgInfoList.add(orgInfoResultDTO);
+        }
+        result.setOrgIdPathList(orgInfoList);
         //查询成员信息
         List<IcResiCollectMemDetailDTO> memberList = icResiMemberDao.selectListByCollectId(dto.getId());
         result.setMemberList(memberList);