From 3931bf81508da2485ffb78ba366bd2058477a291 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 26 Aug 2021 13:54:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ltDTO.java => GridManagerListGeneralResultDTO.java} | 4 ++-- .../controller/user/StaffPatrolDetailController.java | 10 +++++----- .../service/user/StaffPatrolDetailService.java | 6 +++--- .../user/impl/StaffPatrolDetailServiceImpl.java | 9 ++++----- 4 files changed, 14 insertions(+), 15 deletions(-) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/{GridManagerListYuShanResultDTO.java => GridManagerListGeneralResultDTO.java} (93%) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListGeneralResultDTO.java similarity index 93% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListGeneralResultDTO.java index 51ab6b798a..bb7e6c781a 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java +++ b/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 = ""; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java index 5901ada344..f01e9dbe77 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java +++ b/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> gridManagerListYuShan(@RequestBody GridManagerListFormDTO formDTO){ + @PostMapping("gridmanagerlistgeneral") + public Result> gridManagerListGeneral(@RequestBody GridManagerListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, GridManagerListFormDTO.GridManagerListForm.class); - return new Result>().ok(staffPatrolService.gridManagerListYuShan(formDTO)); + return new Result>().ok(staffPatrolService.gridManagerListGeneral(formDTO)); } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java index 41c1e3278c..8bc7a6c4b6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java +++ b/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 gridManagerList(GridManagerListFormDTO formDTO); /** - * @Description 网格员分布-榆山 + * @Description 网格员分布 * @Param formDTO * @author zxc * @date 2021/8/25 3:00 下午 */ - List gridManagerListYuShan(GridManagerListFormDTO formDTO); + List gridManagerListGeneral(GridManagerListFormDTO formDTO); /** * @Description 002、查看巡查记录 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java index 48a11334e2..adec1862e9 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java +++ b/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 gridManagerListYuShan(GridManagerListFormDTO formDTO) { + public List gridManagerListGeneral(GridManagerListFormDTO formDTO) { List resultTwo = this.gridManagerList(formDTO); - List result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListYuShanResultDTO.class); + List result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListGeneralResultDTO.class); Result> listResult = epmetUserOpenFeignClient.patrolInfo(formDTO.getAgencyId()); if (!listResult.success()){ throw new RenException("查询巡查次数和时长失败");