网格员巡查功能接口

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadDetailFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/6/9 16:31
+ */
+@Data
+public class PatrolUploadDetailFormDTO implements Serializable {
+	private static final long serialVersionUID = 1527344810917196996L;
+	/**
+	 * 巡查主记录id, 开始巡查反参
+	 */
+	private String staffPatrolRecId;
+	private List<PatrolUploadFormDTO> details;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -99,6 +99,13 @@ public class StaffPatrolController {
 
 	}
 
+	@PostMapping("uploaddetails")
+	public Result<PatrolUploadResultDTO> uploadDetails(@LoginUser TokenDto tokenDto, @RequestBody PatrolUploadDetailFormDTO formDTO) {
+		PatrolUploadResultDTO result = staffPatrolRecordService.uploadDetails(tokenDto, formDTO);
+		return new Result<PatrolUploadResultDTO>().ok(result);
+
+	}
+
     /**
      * @Description  查询经纬度
      * @Param userIds

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java

@@ -19,14 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.dto.form.PatrolUploadFormDTO;
-import com.epmet.dto.form.StaffPatrolInitFormDTO;
-import com.epmet.dto.form.StartPatrolFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.PatrolUploadResultDTO;
 import com.epmet.dto.result.StaffPatrolInitResultDTO;
 import com.epmet.dto.result.StartPatrolResultDTO;
-import com.epmet.dto.form.PatrolTrackFormDTO;
-import com.epmet.dto.form.RecordListFormDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
 import com.epmet.dto.result.UserNameAndLLResultDTO;
@@ -86,6 +82,17 @@ public interface StaffPatrolRecordService extends BaseService<StaffPatrolRecordE
 	 * @date 2021/6/7 16:49
 	 */
 	PatrolUploadResultDTO uploadDetail(TokenDto tokenDto, PatrolUploadFormDTO formDTO);
+
+	/**
+	 * 上传巡查记录
+	 * @author zhaoqifeng
+	 * @date 2021/6/9 16:32
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.dto.result.PatrolUploadResultDTO
+	 */
+	PatrolUploadResultDTO uploadDetails(TokenDto tokenDto, PatrolUploadDetailFormDTO formDTO);
+
     /**
      * @Description  查询经纬度
      * @Param userIds

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

@@ -27,12 +27,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 工作人员巡查主记录
@@ -217,6 +218,42 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		return dto;
 	}
 
+	/**
+	 * 上传巡查记录
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.dto.result.PatrolUploadResultDTO
+	 * @author zhaoqifeng
+	 * @date 2021/6/9 16:32
+	 */
+	@Override
+	public PatrolUploadResultDTO uploadDetails(TokenDto tokenDto, PatrolUploadDetailFormDTO formDTO) {
+		if (CollectionUtils.isNotEmpty(formDTO.getDetails())) {
+			List<StaffPatrolDetailEntity> list = formDTO.getDetails().stream().map(detail -> {
+				StaffPatrolDetailEntity detailEntity = new StaffPatrolDetailEntity();
+				detailEntity.setStaffPatrolRecId(formDTO.getStaffPatrolRecId());
+				detailEntity.setCustomerId(tokenDto.getCustomerId());
+				detailEntity.setSerialNum(detail.getSerialNum());
+				detailEntity.setUploadTime(new Date());
+				detailEntity.setLatitude(detail.getLatitude());
+				detailEntity.setLongitude(detail.getLongitude());
+				detailEntity.setSpeed(detail.getSpeed());
+				detailEntity.setAccuracy(detail.getAccuracy());
+				detailEntity.setAltitude(detail.getAltitude());
+				detailEntity.setVerticalaccuracy(detail.getVerticalAccuracy());
+				detailEntity.setHorizontalaccuracy(detail.getHorizontalAccuracy());
+				return detailEntity;
+			}).collect(Collectors.toList());
+
+			staffPatrolDetailService.insertBatch(list);
+		}
+
+		PatrolUploadResultDTO dto = new PatrolUploadResultDTO();
+		dto.setStaffPatrolRecId(formDTO.getStaffPatrolRecId());
+		return dto;
+	}
+
 	/**
 	 * @Description  查询经纬度
 	 * @Param userIds