From bbaed756d3f67a9d596caed5d86a3f1802137a41 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 6 Jul 2022 11:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=A4=84=E7=90=86areaCode=E6=A0=91?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BB=8Erelation=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/AreaCodeController.java    | 13 -------------
 .../java/com/epmet/service/AreaCodeService.java | 12 ++----------
 .../epmet/service/impl/AreaCodeServiceImpl.java | 17 +++++++++++------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
index 7fb844a8f9..7bf4e537f8 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
@@ -99,19 +99,6 @@ public class AreaCodeController {
         return new Result<List<AreaCodeDictResultDTO>>().ok(areaCodeService.areaCodeDictTreePlus(formDTO));
     }
 
-    /**
-     * 行政编码查询
-     *
-     * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AreaCodeDictResultDTO>>
-     * @author zhy
-     * @date 2022/7/6 10:28
-     */
-    @PostMapping("areacodedicttreenew")
-    public Result<List<AreaCodeDictResultDTO>> areaCodeDictTreeNew(@RequestBody AreaCodeDictFormDTO formDTO) {
-        return new Result<List<AreaCodeDictResultDTO>>().ok(areaCodeService.areaCodeDictTree(formDTO));
-    }
-
     /**
      * @param formDTO
      * @author yinzuomei
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
index baac590da6..e452332fea 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
@@ -99,22 +99,14 @@ public interface AreaCodeService extends BaseService<AreaCodeEntity> {
      */
     void delete(String[] ids);
 
-    /**
-     * 行政编码查询
-     *
-     * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.AreaCodeDictResultDTO>>
-     * @author zhy
-     * @date 2022/7/6 10:28
-     */
-    List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO);
-
     /**
      * @Description  行政地区编码查询
      * @Param formDTO
      * @author zxc
      * @date 2021/1/7 下午1:41
      */
+    List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO);
+
     List<AreaCodeDictResultDTO> areaCodeDictTreePlus(AreaCodeDictFormDTO formDTO);
 
     /**
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 a414b229aa..4d873b333e 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
@@ -124,17 +124,23 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  行政地区编码查询
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/1/7 下午1:41
+     */
     @Override
     public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
         List<AreaCodeDictResultDTO> tree = new ArrayList<>();
         String s = areaCodeRedis.get(AreaCodeConstant.SCREEN_TREE);
-//        if (StringUtils.isNotBlank(s)){
-//            tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
-//        }else {
+        if (StringUtils.isNotBlank(s)){
+            tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
+        }else {
             List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree(formDTO);
-//            areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS);
+            areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS);
             tree = areaCodeDictResultDTOS;
-//        }
+        }
         if (StringUtils.isBlank(formDTO.getRootAreaCode())){
             return tree;
         }
@@ -151,7 +157,6 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){
         // 查询所有省市区
         List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
-        log.info(areaCodeDTOS.size()+">>>>>>>>>>>>>>>>>>>>>>>>>>>>");
         // 查询所有街道、社区
         List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode());
         List<AreaCodeDictResultDTO> result = new ArrayList<>();