Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java

@@ -27,4 +27,10 @@ public class StaffPatrolInitResultDTO implements Serializable {
 	 * patrolling：返回最大的序号；status=end时，此列返回-1
 	 */
 	private Integer latestSerialNum;
+	/**
+	 * 最小时间间隔，单位s；默认30，后面可以做成客户可配置参数
+	 */
+	private Integer carmDown;
+
+	private String patrolStartTime;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -87,6 +87,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setStaffPatrolRecId(entity.getId());
 		result.setStatus(entity.getStatus());
 		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));
 		return result;
 	}