From 0738a81aee67a562d1a8140e3f34365c2fe3155f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 23 Jun 2021 09:33:00 +0800 Subject: [PATCH] =?UTF-8?q?dto=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/user}/form/PatrolCountFormDTO.java | 2 +- .../java/com/epmet/user}/result/PatrolCountResultDTO.java | 2 +- .../controller/user/StaffPatrolDetailController.java | 4 ++-- .../datareport/service/user/StaffPatrolDetailService.java | 4 ++-- .../service/user/impl/StaffPatrolDetailServiceImpl.java | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) rename {epmet-user/epmet-user-client/src/main/java/com/epmet/dto => epmet-module/data-report/data-report-client/src/main/java/com/epmet/user}/form/PatrolCountFormDTO.java (95%) rename {epmet-user/epmet-user-client/src/main/java/com/epmet/dto => epmet-module/data-report/data-report-client/src/main/java/com/epmet/user}/result/PatrolCountResultDTO.java (95%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolCountFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolCountFormDTO.java similarity index 95% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolCountFormDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolCountFormDTO.java index 86505b98e2..6f48bc75f3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolCountFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolCountFormDTO.java @@ -1,4 +1,4 @@ -package com.epmet.dto.form; +package com.epmet.user.form; import lombok.Data; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolCountResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolCountResultDTO.java similarity index 95% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolCountResultDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolCountResultDTO.java index aeb9032734..4c11895d3d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolCountResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolCountResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.dto.result; +package com.epmet.user.result; import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; 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 68d57fa810..3778182520 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 @@ -3,14 +3,14 @@ package com.epmet.datareport.controller.user; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.user.StaffPatrolDetailService; -import com.epmet.dto.form.PatrolCountFormDTO; -import com.epmet.dto.result.PatrolCountResultDTO; import com.epmet.user.form.GridManagerListFormDTO; import com.epmet.dto.form.PatrolTrackFormDTO; import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.user.form.PatrolCountFormDTO; import com.epmet.user.result.GridManagerListResultDTO; import com.epmet.dto.result.PatrolTrackResultDTO; import com.epmet.dto.result.RecordListResultDTO; +import com.epmet.user.result.PatrolCountResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; 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 d2e94ce385..20573e51a7 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 @@ -1,13 +1,13 @@ package com.epmet.datareport.service.user; -import com.epmet.dto.form.PatrolCountFormDTO; -import com.epmet.dto.result.PatrolCountResultDTO; import com.epmet.user.form.GridManagerListFormDTO; import com.epmet.dto.form.PatrolTrackFormDTO; import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.user.form.PatrolCountFormDTO; import com.epmet.user.result.GridManagerListResultDTO; import com.epmet.dto.result.PatrolTrackResultDTO; import com.epmet.dto.result.RecordListResultDTO; +import com.epmet.user.result.PatrolCountResultDTO; import java.util.List; 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 5590d127b8..4f36820709 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 @@ -9,14 +9,15 @@ import com.epmet.datareport.dao.user.StaffPatrolDetailDao; import com.epmet.datareport.dao.user.StaffPatrolRecordDao; import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService; import com.epmet.datareport.service.user.StaffPatrolDetailService; -import com.epmet.dto.form.PatrolCountFormDTO; import com.epmet.dto.result.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.user.form.GridManagerListFormDTO; import com.epmet.dto.form.PatrolTrackFormDTO; import com.epmet.dto.form.RecordListFormDTO; +import com.epmet.user.form.PatrolCountFormDTO; import com.epmet.user.result.GridManagerListResultDTO; +import com.epmet.user.result.PatrolCountResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired;