Merge remote-tracking branch 'origin/dev_tripreport' into dev_tripreport

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;
+}

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;
+}

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;
+}

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;
+
+
+}

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;
+}

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());

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

@@ -23,10 +23,9 @@ 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.EmphasisTripPieDetailResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcTripReportRecordService;
@@ -369,4 +368,43 @@ 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<PageData<EmphasisTripListResultDTO>> emphasisTripList(@LoginUser TokenDto tokenDto, @RequestBody EmphasisTripListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<PageData<EmphasisTripListResultDTO>>().ok(icTripReportRecordService.emphasisTripList(formDTO));
+    }
+
+    /**
+     * @Description 重点行程详情
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 16:05
+     */
+    @PostMapping("emphasisTripDetail")
+    public Result<EmphasisTripListResultDTO> emphasisTripDetail(@RequestBody EmphasisTripDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, EmphasisTripDetailFormDTO.EmphasisTripDetailForm.class);
+        return new Result<EmphasisTripListResultDTO>().ok(icTripReportRecordService.emphasisTripDetail(formDTO));
+    }
+
+    /**
+     * @Description 【重点行程名单】饼图详情
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 16:09
+     */
+    @PostMapping("emphasisTripPieDetail")
+    public Result<List<EmphasisTripPieDetailResultDTO>> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class);
+        return new Result<List<EmphasisTripPieDetailResultDTO>>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO));
+    }
+
 }

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

@@ -4,9 +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.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;
 
@@ -107,4 +107,28 @@ public interface IcTripReportRecordService extends BaseService<IcTripReportRecor
     void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId);
 
     void psExecAsyncExcelImport(TokenDto tokenDto, HttpServletResponse response, InputStream inputStream, String taskId);
+
+    /**
+     * @Description 【重点行程名单】列表
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 15:44
+     */
+    PageData<EmphasisTripListResultDTO> 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<EmphasisTripPieDetailResultDTO> emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO);
 }

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

@@ -33,6 +33,8 @@ 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.EmphasisTripPieDetailResultDTO;
 import com.epmet.dto.result.TripListDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.IcDangerAreaEntity;
@@ -628,6 +630,41 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
     }
 
+    /**
+     * @Description 【重点行程名单】列表
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 15:44
+     */
+    @Override
+    public PageData<EmphasisTripListResultDTO> emphasisTripList(EmphasisTripListFormDTO formDTO) {
+        PageData<EmphasisTripListResultDTO> result = new PageData<>();
+
+        return result;
+    }
+
+    /**
+     * @Description 重点行程详情
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 16:05
+     */
+    @Override
+    public EmphasisTripListResultDTO emphasisTripDetail(EmphasisTripDetailFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * @Description 【重点行程名单】饼图详情
+     * @param formDTO
+     * @Author zxc
+     * @Date 2022/11/1 16:09
+     */
+    @Override
+    public List<EmphasisTripPieDetailResultDTO> emphasisTripPieDetail(EmphasisTripPieDetailFormDTO formDTO) {
+        return null;
+    }
+
     /**
      * @Author sun
      * @Description 行程上报数据导入，错误数据生成导入失败文件存到阿里云，修改导入任务为已结束