From 5231b71caa3a321955b1b0b5388e7a59ea201bbd Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 11 Jun 2021 15:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1=E6=9F=A5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/StaffPatrolInitResultDTO.java | 12 +++++++++++-
 .../service/impl/StaffPatrolRecordServiceImpl.java | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java
index f98b20ebb3..45d2ab405a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java
@@ -31,6 +31,16 @@ public class StaffPatrolInitResultDTO implements Serializable {
 	 * 最小时间间隔，单位s；默认30，后面可以做成客户可配置参数
 	 */
 	private Integer carmDown;
-
+	/**
+	 * 巡查开始时间
+	 */
 	private String patrolStartTime;
+	/**
+	 * 网格ID
+	 */
+	private String gridId;
+	/**
+	 * 网格名
+	 */
+	private String gridName;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index efd797963d..3c54bb8616 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -89,6 +89,20 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setLatestSerialNum(PatrolConstant.END.equals(entity.getStatus()) ? NumConstant.ONE_NEG : detail.getSerialNum());
 		result.setCarmDown(NumConstant.THIRTY);
 		result.setPatrolStartTime(DateUtils.format(entity.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
+		//状态为巡查中时返回所在网格ID和名称
+		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) {
+			CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
+			customerGridFormDTO.setGridId(formDTO.getGridId());
+			Result<CustomerGridDTO> gridResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+			if (!gridResult.success() || null == gridResult.getData()) {
+				//查询网格名称失败
+				log.error(String.format("查找网格信息失败，网格Id:【%s】", formDTO.getGridId()));
+				throw new RenException(gridResult.getCode(), gridResult.getMsg());
+			}
+			CustomerGridDTO grid = gridResult.getData();
+			result.setGridId(grid.getId());
+			result.setGridName(grid.getGridName());
+		}
 		return result;
 	}