网格员巡查功能接口

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -55,7 +55,7 @@ public class EpmetUserController {
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO>>
      */
-    @PostMapping("recorddetail")
+    @PostMapping("recordlist")
     public Result<List<PatrolRecordListResultDTO>> recordList(@RequestBody PatrolRecordListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<PatrolRecordListResultDTO>>().ok(epmetUserService.recordList(formDTO));

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolRecordService.java

@@ -36,9 +36,10 @@ public interface StaffPatrolRecordService extends BaseService<StaffPatrolRecordE
 	 *
 	 * @param gridId
 	 * @param userId
+	 * @param patrolDate
 	 * @return java.util.List<com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO>
 	 * @author zhaoqifeng
 	 * @date 2021/6/9 14:55
 	 */
-	List<StaffPatrolRecordDTO> getRecordList(String gridId, String userId);
+	List<StaffPatrolRecordDTO> getRecordList(String gridId, String userId, String patrolDate);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -115,7 +115,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      */
     @Override
     public List<PatrolRecordListResultDTO> recordList(PatrolRecordListFormDTO formDTO) {
-        List<StaffPatrolRecordDTO> recordList = staffPatrolRecordService.getRecordList(formDTO.getGridId(), formDTO.getUserId());
+        List<StaffPatrolRecordDTO> recordList = staffPatrolRecordService.getRecordList(formDTO.getGridId(), formDTO.getUserId(), formDTO.getPatrolDate());
         if (CollectionUtils.isEmpty(recordList)) {
             return Collections.emptyList();
         }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java

@@ -58,13 +58,13 @@ public class StaffPatrolDetailServiceImpl extends BaseServiceImpl<StaffPatrolDet
 		if (CollectionUtils.isEmpty(recordIds)) {
 			return Collections.emptyMap();
 		}
-		StringBuilder sql = new StringBuilder("WHERE ( 1=1 ");
+		StringBuilder sql = new StringBuilder("( STAFF_PATROL_REC_ID = '' ");
 		for (String id : recordIds) {
 			sql.append("OR STAFF_PATROL_REC_ID = '").append(id).append("' ");
 		}
 		sql.append(")");
 		QueryWrapper<StaffPatrolDetailEntity> wrapper = new QueryWrapper<>();
-		wrapper.last(sql.toString());
+		wrapper.apply(sql.toString());
 		List<StaffPatrolDetailDTO> list = ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), StaffPatrolDetailDTO.class);
 		return list.stream().collect(Collectors.groupingBy(StaffPatrolDetailDTO::getStaffPatrolRecId));
 	}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolRecordServiceImpl.java

@@ -48,15 +48,17 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	 *
 	 * @param gridId
 	 * @param userId
+	 * @param patrolDate
 	 * @return java.util.List<com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO>
 	 * @author zhaoqifeng
 	 * @date 2021/6/9 14:55
 	 */
 	@Override
-	public List<StaffPatrolRecordDTO> getRecordList(String gridId, String userId) {
+	public List<StaffPatrolRecordDTO> getRecordList(String gridId, String userId, String patrolDate) {
 		QueryWrapper<StaffPatrolRecordEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq("GRID", gridId)
 				.eq("STAFF_ID", userId)
+				.eq("DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d') ", patrolDate)
 				.orderByDesc("PATROL_START_TIME");
 
 		return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), StaffPatrolRecordDTO.class);

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

@@ -105,6 +105,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		//获取最新的巡查记录
 		QueryWrapper<StaffPatrolRecordEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), "GRID", formDTO.getGridId())
+				.eq("STAFF_ID", tokenDto.getUserId())
 				.orderByDesc("PATROL_START_TIME")
 				.last("limit 1");
 		StaffPatrolRecordEntity entity = baseDao.selectOne(wrapper);
@@ -168,13 +169,16 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		if (null == record) {
 			throw new RenException("巡查记录不存在");
 		}
+		if (PatrolConstant.END.equals(record.getStatus())) {
+			throw new RenException("巡查已结束，请勿重复提交");
+		}
 
 		record.setActrualEndTime(new Date());
 		record.setUpdatedTime(null);
 		record.setPatrolEndTime(DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN));
 		record.setTotalTime(DateUtils.calculateSecond(record.getPatrolStartTime(), record.getPatrolEndTime()));
 		record.setStatus(PatrolConstant.END);
-
+		baseDao.updateById(record);
 		//保存记录明细
 		StaffPatrolDetailEntity detailEntity = new StaffPatrolDetailEntity();
 		detailEntity.setStaffPatrolRecId(record.getId());