From 0181c1c8cbd01b9ae3a6e33e39d39a104c9b02c6 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 20 Dec 2022 15:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatrolRoutineWorkController.java          |  6 ++++
 .../service/PatrolRoutineWorkService.java     |  2 ++
 .../impl/PatrolRoutineWorkServiceImpl.java    | 34 +++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java
index d004630d41..4e65a25e80 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PatrolRoutineWorkController.java
@@ -120,4 +120,10 @@ public class PatrolRoutineWorkController {
         return new Result<RoutineWorkDetailResultDTO>().ok(gridUserWorkService.detail(formDTO));
     }
 
+    @PostMapping("getdetail")
+    public Result<RoutineWorkDetailResultDTO> getDetail(@LoginUser TokenDto tokenDto, @RequestBody GridMemberRoutineWorkFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<RoutineWorkDetailResultDTO>().ok(gridUserWorkService.detail(formDTO));
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java
index 0023dea98e..35f82fe153 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/PatrolRoutineWorkService.java
@@ -75,4 +75,6 @@ public interface PatrolRoutineWorkService extends BaseService<PatrolRoutineWorkE
      * @Description 【例行工作】例行工作详情
      **/
     RoutineWorkDetailResultDTO detail(GridMemberRoutineWorkFormDTO formDTO);
+
+    RoutineWorkDetailResultDTO getDetail(GridMemberRoutineWorkFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
index 8a0d48152e..d14e1c9398 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
@@ -446,4 +446,38 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
 
     }
 
+    @Override
+    public RoutineWorkDetailResultDTO getDetail(GridMemberRoutineWorkFormDTO formDTO) {
+        //1.查询例行工作详情数据
+        RoutineWorkDetailResultDTO resultDTO = baseDao.getDetail(formDTO.getRoutineWorkId());
+        if (null == resultDTO) {
+            return new RoutineWorkDetailResultDTO();
+        }
+        //2.获取工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), resultDTO.getStaffId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId()));
+        }
+        //3.获取网格缓存信息
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(resultDTO.getGridId());
+        if (null == gridInfo) {
+            throw new EpmetException(String.format("未查询到网格{%s}信息", resultDTO.getGridId()));
+        }
+        if (StringUtils.isEmpty(gridInfo.getAgencyName())) {
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(gridInfo.getPid());
+            gridInfo.setAgencyName(agencyInfo.getOrganizationName());
+        }
+        //4.获取例行工作类型字典表数据
+        Result<Map<String, String>> unitTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.PATROL_WORK_TYPE.getCode());
+        if (!unitTypeMap.success() || MapUtils.isEmpty(unitTypeMap.getData())) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取例行工作类型字典表数据失败！");
+        }
+        //5.封装数据并返回
+        resultDTO.setGridName(gridInfo.getAgencyName() + "-" + gridInfo.getGridName());
+        resultDTO.setStaffName(staffInfo.getRealName());
+        resultDTO.setWorkTypeName(unitTypeMap.getData().get(resultDTO.getAllPCode()) + "-" + unitTypeMap.getData().get(resultDTO.getWorkTypeCode()));
+        return resultDTO;
+
+    }
+
 }