Merge remote-tracking branch 'remotes/origin/dev'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -170,10 +170,7 @@ public enum RequirePermissionEnum {
      * 更多-日志记录
      */
     MORE_PATROL_RECORD_LIST("more_patrol_record_list","更多:日志记录:巡查记录:列表","巡查记录列表"),
-    /**
-     * 更多-系统
-     */
-    MORE_SYSTEM_LOG_LIST("MORE_SYSTEM_LOG_LIST","更多:系统:系统日志:列表","系统日志列表"),
+    MORE_SYSTEM_LOG_LIST("MORE_SYSTEM_LOG_LIST","更多:日志记录:系统日志:列表","系统日志列表"),
 
 
     /**

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;
 }

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(entity.getGrid());
+			Result<CustomerGridDTO> gridResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
+			if (!gridResult.success() || null == gridResult.getData()) {
+				//查询网格名称失败
+				log.error(String.format("查找网格信息失败，网格Id:【%s】", entity.getGrid()));
+				throw new RenException(gridResult.getCode(), gridResult.getMsg());
+			}
+			CustomerGridDTO grid = gridResult.getData();
+			result.setGridId(grid.getId());
+			result.setGridName(grid.getGridName());
+		}
 		return result;
 	}