From 9a64fe82f58bdf3c1d3bdbd803dbd29164ba0e9c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 15:52:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EmphasisTripListFormDTO.java | 22 +++++++++++++++++++ .../dto/result/EmphasisTripListResultDTO.java | 16 ++++++++++++++ .../controller/IcDangerAreaController.java | 2 +- .../IcTripReportRecordController.java | 21 ++++++++++++++---- .../service/IcTripReportRecordService.java | 11 ++++++++++ .../impl/IcTripReportRecordServiceImpl.java | 14 ++++++++++++ 6 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java new file mode 100644 index 0000000000..8c2eab988f --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:39 + */ +@Data +public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 5850717233738956442L; + + private String code; + + private String dangerLevel; + + private String staffId; + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java new file mode 100644 index 0000000000..85d78ff9cb --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:38 + */ +@Data +public class EmphasisTripListResultDTO implements Serializable { + private static final long serialVersionUID = -1646171374911115465L; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java index ea4ebcc55b..3d3fbd1cc7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcDangerAreaController.java @@ -88,7 +88,7 @@ public class IcDangerAreaController implements ResultDataResolver{ * @Date 2022/11/1 09:09 */ @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); dto.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 74139ac33d..f51061dac1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -23,10 +23,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; -import com.epmet.dto.form.IcTripReportFormDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.MyReportedTripFormDTO; -import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; @@ -369,4 +367,19 @@ public class IcTripReportRecordController implements ResultDataResolver { return new Result(); } + /** + * @Description 【重点行程名单】列表 + * @param tokenDto + * @param formDTO + * @Author zxc + * @Date 2022/11/1 15:43 + */ + @PostMapping("list") + public Result> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icTripReportRecordService.emphasisTripList(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 998e942b3d..b95800b56a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -4,9 +4,11 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcTripReportRecordDTO; +import com.epmet.dto.form.EmphasisTripListFormDTO; import com.epmet.dto.form.IcTripReportFormDTO; import com.epmet.dto.form.MyReportedTripFormDTO; import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; @@ -107,4 +109,13 @@ public interface IcTripReportRecordService extends BaseService emphasisTripList(EmphasisTripListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 0b97b0d90d..b1f57db163 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -33,6 +33,7 @@ import com.epmet.dao.UserBaseInfoDao; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; +import com.epmet.dto.result.EmphasisTripListResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; @@ -628,6 +629,19 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripList(EmphasisTripListFormDTO formDTO) { + PageData result = new PageData<>(); + + return result; + } + /** * @Author sun * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束 From 1ea38545ada3d66ffc9a4fca9616e16653d8fda1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 1 Nov 2022 16:10:43 +0800 Subject: [PATCH 2/2] zanti --- .../dto/form/EmphasisTripDetailFormDTO.java | 20 ++++++++++++++ .../form/EmphasisTripPieDetailFormDTO.java | 20 ++++++++++++++ .../EmphasisTripPieDetailResultDTO.java | 18 +++++++++++++ .../IcTripReportRecordController.java | 27 ++++++++++++++++++- .../service/IcTripReportRecordService.java | 21 ++++++++++++--- .../impl/IcTripReportRecordServiceImpl.java | 23 ++++++++++++++++ 6 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java new file mode 100644 index 0000000000..b36ab7db3c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 15:58 + */ +@Data +public class EmphasisTripDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4725053371888196275L; + + public interface EmphasisTripDetailForm{} + + @NotBlank(message = "id不能为空",groups = {EmphasisTripDetailForm.class}) + private String id; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java new file mode 100644 index 0000000000..ee0e6b5681 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 16:08 + */ +@Data +public class EmphasisTripPieDetailFormDTO implements Serializable { + private static final long serialVersionUID = 8822391154779579664L; + + public interface EmphasisTripPieDetailForm{} + + @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) + private String code; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java new file mode 100644 index 0000000000..4ebb22d6f0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripPieDetailResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/11/1 16:06 + */ +@Data +public class EmphasisTripPieDetailResultDTO implements Serializable { + private static final long serialVersionUID = -7654816048391073022L; + + private String dangerLevelName; + private String dangerLevel; + private Integer total; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index f51061dac1..316610e690 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -25,6 +25,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcTripReportRecordService; @@ -380,6 +381,30 @@ public class IcTripReportRecordController implements ResultDataResolver { formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icTripReportRecordService.emphasisTripList(formDTO)); - } + } + + /** + * @Description 重点行程详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:05 + */ + @PostMapping("emphasisTripDetail") + public Result emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class); + return new Result().ok(icTripReportRecordService.emphasisTripDetail(formDTO)); + } + + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:09 + */ + @PostMapping("emphasisTripPieDetail") + public Result> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class); + return new Result>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index b95800b56a..5d971a0719 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -4,11 +4,9 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcTripReportRecordDTO; -import com.epmet.dto.form.EmphasisTripListFormDTO; -import com.epmet.dto.form.IcTripReportFormDTO; -import com.epmet.dto.form.MyReportedTripFormDTO; -import com.epmet.dto.form.PageTripReportFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.entity.IcTripReportRecordEntity; @@ -118,4 +116,19 @@ public interface IcTripReportRecordService extends BaseService emphasisTripList(EmphasisTripListFormDTO formDTO); + /** + * @Description 重点行程详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:05 + */ + EmphasisTripListResultDTO emphasisTripDetail(EmphasisTripDetailFormDTO formDTO); + + /** + * @Description 【重点行程名单】饼图详情 + * @param formDTO + * @Author zxc + * @Date 2022/11/1 16:09 + */ + List emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index b1f57db163..9b21c1c212 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.EmphasisTripListResultDTO; +import com.epmet.dto.result.EmphasisTripPieDetailResultDTO; import com.epmet.dto.result.TripListDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcDangerAreaEntity; @@ -642,6 +643,28 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO) { + return null; + } + /** * @Author sun * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束