From f2b8ab3ffcff9d5737482c4252c906b012e9a5ab Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 20 Dec 2021 15:36:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E8=AE=B0=E5=BD=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9C=B0=E5=9D=80=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PatrolRecordDetailDTO.java | 5 +++ .../dto/form/PatrolUploadDetailFormDTO.java | 21 ----------- .../epmet/dto/form/PatrolUploadFormDTO.java | 4 ++ .../controller/StaffPatrolController.java | 7 ---- .../epmet/entity/StaffPatrolDetailEntity.java | 2 +- .../service/StaffPatrolRecordService.java | 10 ----- .../impl/StaffPatrolRecordServiceImpl.java | 37 +------------------ 7 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadDetailFormDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java index 922f21867b..f7e9afeabb 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java @@ -34,4 +34,9 @@ public class PatrolRecordDetailDTO implements Serializable { * 后端返回：开始巡查；结束巡查；此列只有集合第一条，和最后一条有值 */ private String flag; + + /** + * 位置信息 + */ + private String address; } 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 deleted file mode 100644 index 4484f45f30..0000000000 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadDetailFormDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -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-client/src/main/java/com/epmet/dto/form/PatrolUploadFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadFormDTO.java index 368979a3aa..c1d17b2d18 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadFormDTO.java @@ -54,4 +54,8 @@ public class PatrolUploadFormDTO implements Serializable { * 序号,前端生成，后端记录 */ private Integer serialNum; + /** + * 位置信息 + */ + private String address; } 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 53933da2ae..dbd32146fa 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 @@ -120,13 +120,6 @@ 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/entity/StaffPatrolDetailEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java index fbc81edd1a..d90192e218 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java @@ -94,7 +94,7 @@ public class StaffPatrolDetailEntity extends BaseEpmetEntity { private String horizontalaccuracy; /** - * 地址；暂时不用 + * 地址 */ private String address; 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 e9cbb44ce7..4b54f84c97 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 @@ -91,16 +91,6 @@ 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