名字修改

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java → epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListGeneralResultDTO.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @DESC
  */
 @Data
-public class GridManagerListYuShanResultDTO implements Serializable {
+public class GridManagerListGeneralResultDTO implements Serializable {
 
     private static final long serialVersionUID = -2770911125810373090L;
 
@@ -78,7 +78,7 @@ public class GridManagerListYuShanResultDTO implements Serializable {
     @JsonIgnore
     private Boolean llStatus;
 
-    public GridManagerListYuShanResultDTO() {
+    public GridManagerListGeneralResultDTO() {
         this.staffId = "";
         this.longitude = "";
         this.latitude = "";

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java

@@ -11,7 +11,7 @@ import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
-import com.epmet.user.result.GridManagerListYuShanResultDTO;
+import com.epmet.user.result.GridManagerListGeneralResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -79,15 +79,15 @@ public class StaffPatrolDetailController {
     }
 
     /**
-     * @Description  网格员分布-榆山
+     * @Description  网格员分布
      * @Param formDTO
      * @author zxc
      * @date 2021/8/25 3:00 下午
      */
-    @PostMapping("gridmanagerlist-yushan")
-    public Result<List<GridManagerListYuShanResultDTO>> gridManagerListYuShan(@RequestBody GridManagerListFormDTO formDTO){
+    @PostMapping("gridmanagerlistgeneral")
+    public Result<List<GridManagerListGeneralResultDTO>> gridManagerListGeneral(@RequestBody GridManagerListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, GridManagerListFormDTO.GridManagerListForm.class);
-        return new Result<List<GridManagerListYuShanResultDTO>>().ok(staffPatrolService.gridManagerListYuShan(formDTO));
+        return new Result<List<GridManagerListGeneralResultDTO>>().ok(staffPatrolService.gridManagerListGeneral(formDTO));
     }
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java

@@ -8,7 +8,7 @@ import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
-import com.epmet.user.result.GridManagerListYuShanResultDTO;
+import com.epmet.user.result.GridManagerListGeneralResultDTO;
 
 import java.util.List;
 
@@ -29,12 +29,12 @@ public interface StaffPatrolDetailService{
     List<GridManagerListResultDTO> gridManagerList(GridManagerListFormDTO formDTO);
 
     /**
-     * @Description  网格员分布-榆山
+     * @Description  网格员分布
      * @Param formDTO
      * @author zxc
      * @date 2021/8/25 3:00 下午
      */
-    List<GridManagerListYuShanResultDTO> gridManagerListYuShan(GridManagerListFormDTO formDTO);
+    List<GridManagerListGeneralResultDTO> gridManagerListGeneral(GridManagerListFormDTO formDTO);
 
     /**
      * @Description  002、查看巡查记录

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java

@@ -3,7 +3,6 @@ package com.epmet.datareport.service.user.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.constant.PatrolConstant;
 import com.epmet.datareport.dao.user.StaffPatrolDetailDao;
@@ -19,7 +18,7 @@ import com.epmet.dto.form.RecordListFormDTO;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
-import com.epmet.user.result.GridManagerListYuShanResultDTO;
+import com.epmet.user.result.GridManagerListGeneralResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -138,15 +137,15 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     }
 
     /**
-     * @Description  网格员分布-榆山
+     * @Description  网格员分布
      * @Param formDTO
      * @author zxc
      * @date 2021/8/25 3:00 下午
      */
     @Override
-    public List<GridManagerListYuShanResultDTO> gridManagerListYuShan(GridManagerListFormDTO formDTO) {
+    public List<GridManagerListGeneralResultDTO> gridManagerListGeneral(GridManagerListFormDTO formDTO) {
         List<GridManagerListResultDTO> resultTwo = this.gridManagerList(formDTO);
-        List<GridManagerListYuShanResultDTO> result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListYuShanResultDTO.class);
+        List<GridManagerListGeneralResultDTO> result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListGeneralResultDTO.class);
         Result<List<PatrolYuShanResultDTO>> listResult = epmetUserOpenFeignClient.patrolInfo(formDTO.getAgencyId());
         if (!listResult.success()){
             throw new RenException("查询巡查次数和时长失败");