From c55719d76874df25c4a7d3315cf665a1ffe91808 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 4 Nov 2022 09:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/SysDeptController.java    | 15 ++++++++++-
 .../esua/epdc/service/SysDeptService.java     | 10 +++++++
 .../epdc/service/impl/SysDeptServiceImpl.java | 26 +++++++++++++++++++
 esua-epdc/epdc-cloud-commons-shibei           |  2 +-
 .../modules/item/service/ItemService.java     |  1 -
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index 0d90a8cbe..ecad63c8b 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -397,7 +397,7 @@ public class SysDeptController {
         return new Result<List<ExportKpiResultDTO>>().ok(list);
     }
 
-    /*
+    /**
      *
      * 根据部门id和部门类型查询 所属网格
      * @author wk
@@ -526,4 +526,17 @@ public class SysDeptController {
         return new Result<List<DeptDTO>>().ok(sysDeptService.listAll(new HashMap<>()));
     }
 
+    /**
+     * 猜测部门ID
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptInfoCodeDTO>
+     * @author zhy
+     * @date 2022/11/3 17:16
+     */
+    @PostMapping("guess/{deptId}")
+    public Result<DeptInfoCodeDTO> guessDeptId(@PathVariable("deptId") Long deptId) {
+        DeptInfoCodeDTO dto = sysDeptService.guessDeptId(deptId);
+        return new Result<DeptInfoCodeDTO>().ok(dto);
+    }
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 0de656e8b..1b6d8af76 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -419,4 +419,14 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     SysDeptDTO getDept(CityCenterFromDTO formDTO);
 
+    /**
+     * 猜测部门ID
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptInfoCodeDTO>
+     * @author zhy
+     * @date 2022/11/3 17:16
+     */
+    DeptInfoCodeDTO guessDeptId(Long deptId);
+
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index e0b3e9f33..9cc8a63bc 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -1495,6 +1495,32 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return ConvertUtils.sourceToTarget(entity, SysDeptDTO.class);
     }
 
+    @Override
+    public DeptInfoCodeDTO guessDeptId(Long deptId) {
+        DeptInfoCodeDTO resultDTO = new DeptInfoCodeDTO();
+        SysDeptDTO dto = get(deptId);
+        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(dto.getTypeKey())) {
+            SysDeptDTO community = get(dto.getPid());
+            SysDeptDTO street = get(community.getPid());
+            resultDTO.setGridId(deptId);
+            resultDTO.setGridName(dto.getName());
+            resultDTO.setCommunityId(community.getId());
+            resultDTO.setCommunityName(community.getName());
+            resultDTO.setStreetId(street.getId());
+            resultDTO.setStreetName(street.getName());
+        } else if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(dto.getTypeKey())) {
+            SysDeptDTO street = get(dto.getPid());
+            resultDTO.setCommunityId(dto.getId());
+            resultDTO.setCommunityName(dto.getName());
+            resultDTO.setStreetId(street.getId());
+            resultDTO.setStreetName(street.getName());
+        } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(dto.getTypeKey())) {
+            resultDTO.setStreetId(dto.getId());
+            resultDTO.setStreetName(dto.getName());
+        }
+        return resultDTO;
+    }
+
     /**
      * @return java.lang.String
      * @describe: 访问外部接口获取部门（社区）地区编码
diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index ff7f3322b..b4f6f969e 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit ff7f3322b157c4c9e4138a47f94048213fcd61ea
+Subproject commit b4f6f969e484342454e6d17f2716eeed4f96a75d
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
index f54b3d170..25d4570e4 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
@@ -34,7 +34,6 @@ import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;