增加地区名称查询

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDetailFormDTO.java

@@ -0,0 +1,9 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+@Data
+public class AreaCodeDetailFormDTO {
+    private String areaCode;
+    private String level;
+}

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java

@@ -98,6 +98,17 @@ public interface EpmetCommonServiceOpenFeignClient {
     @PostMapping("commonservice/workday/workminutes")
     Result<Map<String,Integer>> workMinutes(@RequestBody WorkMinuteFormDTO param);
 
+    /**
+     * 行政地区编码查询
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AreaCodeDictResultDTO>>
+     * @author zhy
+     * @date 2022/7/6 15:07
+     */
+    @PostMapping("commonservice/areacode/areacodedetail")
+    Result<AreaCodeResultDTO> areaCodeDetail(@RequestBody AreaCodeDetailFormDTO formDTO);
+
     /**
      * @Description  行政地区编码查询
      * @Param formDTO

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@@ -79,6 +79,11 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "workMinutes", param);
     }
 
+    @Override
+    public Result<AreaCodeResultDTO> areaCodeDetail(AreaCodeDetailFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeDetail", formDTO);
+    }
+
     @Override
     public Result<List<AreaCodeDictResultDTO>> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "areaCodeDictTree", formDTO);

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java

@@ -25,10 +25,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.AreaCodeDTO;
-import com.epmet.dto.form.AddAreaCodeDictFormDTO;
-import com.epmet.dto.form.AddAreaCodeFormDTO;
-import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.form.AreaCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
 import com.epmet.service.AreaCodeService;
@@ -133,4 +130,15 @@ public class AreaCodeController {
     public Result<List<AreaCodeResultDTO>> nextArea(@RequestBody AreaCodeFormDTO formDTO){
         return new Result<List<AreaCodeResultDTO>>().ok(areaCodeService.nextArea(formDTO));
     }
+
+    /**
+     * @Description  行政地区编码查询
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/1/7 下午1:41
+     */
+    @PostMapping("areacodedetail")
+    public Result<AreaCodeResultDTO> areaCodeDetail(@RequestBody AreaCodeDetailFormDTO formDTO){
+        return new Result<AreaCodeResultDTO>().ok(areaCodeService.getAreaCodeDetail(formDTO));
+    }
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java

@@ -37,9 +37,15 @@ public interface AreaCodeDao extends BaseDao<AreaCodeEntity> {
 
     List<AreaCodeDTO> selectAllArea();
 
-    AreaCodeDTO selectByCountyCode(String countyCode);
+    AreaCodeDTO selectByCountyCode(@Param("countyCode") String countyCode);
 
-    AreaCodeDTO selectByCityCode(String cityCode);
+    AreaCodeDTO selectByCityCode(@Param("cityCode") String cityCode);
+
+    AreaCodeDTO selectByProvinceCode(@Param("provinceCode") String provinceCode);
+
+    AreaCodeResultDTO selectByStreetCode(@Param("streetCode") String streetCode);
+
+    AreaCodeResultDTO selectByCommunityCode(@Param("communityCode") String communityCode);
 
     AreaCodeDTO selectMaxCounty(String cityCode);
 

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java

@@ -20,10 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.AreaCodeDTO;
-import com.epmet.dto.form.AddAreaCodeDictFormDTO;
-import com.epmet.dto.form.AddAreaCodeFormDTO;
-import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.form.AreaCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
 import com.epmet.entity.AreaCodeEntity;
@@ -127,4 +124,6 @@ public interface AreaCodeService extends BaseService<AreaCodeEntity> {
     String addAreaCode(AddAreaCodeFormDTO formDTO);
 
     List<AreaCodeResultDTO> nextArea(AreaCodeFormDTO formDTO);
+
+    AreaCodeResultDTO getAreaCodeDetail(AreaCodeDetailFormDTO formDTO);
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -36,10 +36,7 @@ import com.epmet.dao.AreaCodeChildDao;
 import com.epmet.dao.AreaCodeDao;
 import com.epmet.dto.AreaCodeChildDTO;
 import com.epmet.dto.AreaCodeDTO;
-import com.epmet.dto.form.AddAreaCodeDictFormDTO;
-import com.epmet.dto.form.AddAreaCodeFormDTO;
-import com.epmet.dto.form.AreaCodeDictFormDTO;
-import com.epmet.dto.form.AreaCodeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.AreaCodeDictResultDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
 import com.epmet.entity.AreaCodeEntity;
@@ -72,6 +69,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     private AreaCodeChildDao childDao;
     @Autowired
     private AreaCodeChildService areaCodeChildService;
+
     @Override
     public PageData<AreaCodeDTO> page(Map<String, Object> params) {
         IPage<AreaCodeEntity> page = baseDao.selectPage(
@@ -240,14 +238,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
 
     /**
      * @Description 根据节点获取组织区域树【遍历】，传参只能是 省，市，区级别 【暂时这样，循环太多了】
-     *
-     *
+     * <p>
+     * <p>
      * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
      * ==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==
      * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
-     *
-     *
-     *
      * @Param tree
      * @Param rootAreaCode
      * @author zxc
@@ -734,6 +729,48 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         return list;
     }
 
+    @Override
+    public AreaCodeResultDTO getAreaCodeDetail(AreaCodeDetailFormDTO formDTO) {
+        AreaCodeResultDTO result = new AreaCodeResultDTO();
+        switch (formDTO.getLevel()) {
+            case AreaCodeConstant.PROVINCE:
+                AreaCodeDTO province = baseDao.selectByProvinceCode(formDTO.getAreaCode());
+                if (province != null) {
+                    result.setAreaName(province.getProvinceName());
+                    result.setAreaCode(province.getProvinceCode());
+                    result.setParentCode(NumConstant.ZERO_STR);
+                    result.setLevel(AreaCodeConstant.PROVINCE);
+                }
+                break;
+            case AreaCodeConstant.CITY:
+                AreaCodeDTO city = baseDao.selectByCityCode(formDTO.getAreaCode());
+                if (city != null) {
+                    result.setAreaName(city.getCityName());
+                    result.setAreaCode(city.getCityName());
+                    result.setParentCode(city.getProvinceCode());
+                    result.setLevel(AreaCodeConstant.CITY);
+                }
+                break;
+            case AreaCodeConstant.DISTRICT:
+                AreaCodeDTO county = baseDao.selectByCountyCode(formDTO.getAreaCode());
+                if (county != null) {
+                    result.setAreaName(county.getCountyName());
+                    result.setAreaCode(county.getCountyCode());
+                    result.setParentCode(county.getCityCode());
+                    result.setLevel(AreaCodeConstant.DISTRICT);
+                }
+                break;
+            case AreaCodeConstant.STREET:
+                result = baseDao.selectByStreetCode(formDTO.getAreaCode());
+                break;
+            case AreaCodeConstant.COMMUNITY:
+                result = baseDao.selectByCommunityCode(formDTO.getAreaCode());
+                break;
+            default:
+                log.warn("Level错误：" + formDTO.getLevel());
+        }
+        return result;
+    }
 
     private String addDistrictAreaCode(String cityCode, String countyName) {
         AreaCodeDTO city = baseDao.selectByCityCode(cityCode);

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml

@@ -20,6 +20,16 @@
             and m.`CODE`=#{code}
     </select>
 
+    <select id="getByCode" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+            *
+        FROM
+            area_code_child m
+        WHERE
+            m.DEL_FLAG = '0'
+            and m.`CODE`= #{code}
+    </select>
+
     <!--   根据p_code、name查询社区列表 -->
     <select id="selectByPCodeAndName" resultType="com.epmet.dto.AreaCodeChildDTO">
         SELECT

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml

@@ -19,6 +19,13 @@
         and ac.CITY_CODE=#{cityCode}
     </select>
 
+    <select id="selectByProvinceCode" resultType="com.epmet.dto.AreaCodeDTO">
+        select distinct ac.PROVINCE_CODE,ac.PROVINCE_NAME
+        from area_code ac
+        where ac.DEL_FLAG='0'
+        and ac.PROVINCE_CODE=#{provinceCode}
+    </select>
+
     <select id="selectMaxCounty" resultType="com.epmet.dto.AreaCodeDTO" parameterType="java.lang.String">
         select *
         from area_code ac
@@ -106,4 +113,28 @@
         ORDER BY
             ac.`code` ASC
     </select>
+    <select id="selectByStreetCode"  resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+        ac.`code` AS areaCode,
+        ac.`name` AS areaName,
+        ac.p_code AS parentCode,
+        'street' AS LEVEL
+        FROM
+        area_code_child ac
+        WHERE
+        ac.DEL_FLAG = '0'
+        AND ac.`code` = #{streetCode}
+    </select>
+    <select id="selectByCommunityCode" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+        SELECT
+        ac.`code` AS areaCode,
+        ac.`name` AS areaName,
+        ac.p_code AS parentCode,
+        'street' AS LEVEL
+        FROM
+        area_code_child ac
+        WHERE
+        ac.DEL_FLAG = '0'
+        AND ac.`code` = #{communityCode}
+    </select>
 </mapper>

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerRelationTreeDTO.java

@@ -84,6 +84,11 @@ public class CustomerRelationTreeDTO implements Serializable {
      */
 	private String areaCode;
 
+    /**
+     * 当前客户的地区名称
+     */
+    private String areaName;
+
     /**
      * 下一级
      */

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -111,6 +111,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>common-service-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java

@@ -27,11 +27,16 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerRelationDao;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerRelationDTO;
+import com.epmet.dto.form.AreaCodeDetailFormDTO;
+import com.epmet.dto.result.AreaCodeResultDTO;
 import com.epmet.dto.result.CustomerRelationTreeDTO;
 import com.epmet.entity.CustomerRelationEntity;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.redis.CustomerRedis;
 import com.epmet.service.CustomerRelationService;
 import com.epmet.service.CustomerService;
@@ -60,6 +65,8 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
     private CustomerRedis customerRedis;
     @Autowired
     private CustomerService customerService;
+    @Autowired
+    private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 
     @Override
     public PageData<CustomerRelationDTO> page(Map<String, Object> params) {
@@ -178,7 +185,18 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         String customerId = "78e2b2227c07de1fe54da14e2b2d9eb6";
         List<CustomerRelationTreeDTO> rootList = baseDao.selectRootCustomerByCustomerId(customerId);
         if (!rootList.isEmpty()) {
-            rootList.forEach(this::getSubCustomer);
+            rootList.forEach(item -> {
+                AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO();
+                formDTO.setAreaCode(item.getAreaCode());
+                formDTO.setLevel(item.getLevel());
+                Result<AreaCodeResultDTO> area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO);
+                if (area.success()) {
+                    if (area.getData() != null) {
+                        item.setAreaName(area.getData().getAreaName());
+                    }
+                }
+                getSubCustomer(item);
+            });
         }
         return rootList;
     }
@@ -195,7 +213,18 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         List<CustomerRelationTreeDTO> children = baseDao.selectSubCustomerByPid(customer.getCustomerId());
         customer.setChildren(children);
         if (!children.isEmpty()) {
-            children.forEach(this::getSubCustomer);
+            children.forEach(item -> {
+                AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO();
+                formDTO.setAreaCode(item.getAreaCode());
+                formDTO.setLevel(item.getLevel());
+                Result<AreaCodeResultDTO> area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO);
+                if (area.success()) {
+                    if (area.getData() != null) {
+                        item.setAreaName(area.getData().getAreaName());
+                    }
+                }
+                getSubCustomer(item);
+            });
         }
         return customer;
     }