From 4277d64290bb4457e8dcd2452c4a2009da1481f6 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 6 Jul 2022 10:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8C=BA=E5=9F=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/AreaCodeController.java    | 13 +++++++++++++
 .../java/com/epmet/service/AreaCodeService.java     | 12 ++++++++++--
 .../com/epmet/service/impl/AreaCodeServiceImpl.java |  6 ------
 3 files changed, 23 insertions(+), 8 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 7bf4e537f8..7fb844a8f9 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,6 +99,19 @@ 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 e452332fea..baac590da6 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,14 +99,22 @@ 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 4d873b333e..0300b2ae78 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,12 +124,6 @@ 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<>();