diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadDetailFormDTO.java new file mode 100644 index 0000000000..4484f45f30 --- /dev/null +++ b/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 details; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java index 746623d905..4948e36d7a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java @@ -99,6 +99,13 @@ public class StaffPatrolController { } + @PostMapping("uploaddetails") + public Result uploadDetails(@LoginUser TokenDto tokenDto, @RequestBody PatrolUploadDetailFormDTO formDTO) { + PatrolUploadResultDTO result = staffPatrolRecordService.uploadDetails(tokenDto, formDTO); + return new Result().ok(result); + + } + /** * @Description 查询经纬度 * @Param userIds diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java index 254219e19d..7eae381718 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java +++ b/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 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