From b76f338b7a50113f2762642c2016acea1e6e3810 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Sat, 28 Aug 2021 21:04:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E9=A6=96=E9=A1=B5-=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=91=98=E5=88=97=E8=A1=A8,FormDTO=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiAdminController.java | 4 ++-- .../main/java/com/elink/esua/epdc/feign/AdminFeignClient.java | 4 ++-- .../esua/epdc/feign/fallback/AdminFeignClientFallback.java | 4 ++-- .../main/java/com/elink/esua/epdc/service/AdminService.java | 4 ++-- .../com/elink/esua/epdc/service/impl/AdminServiceImpl.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index 7ba8bbe..918f511 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -4,7 +4,7 @@ import com.elink.esua.epdc.common.token.annotation.LoginUser; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +61,7 @@ public class ApiAdminController { * @since 2021/8/28 18:43 */ @GetMapping("/sysUser/gridmanList") - public Result getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridOperatorFormDTO formDto){ + public Result getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridManFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return adminService.getGridmanList(tokenDto,formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index c3ca1dc..f11ea47 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -8,7 +8,7 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; -import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -168,5 +168,5 @@ public interface AdminFeignClient { * @since 2021/8/28 18:41 */ @GetMapping("admin/sysUser/gridmanList") - Result getGridmanList(EpdcAppGridOperatorFormDTO formDto); + Result getGridmanList(EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 66c65a9..b1c3a8b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -9,7 +9,7 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; -import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import org.springframework.stereotype.Component; @@ -86,7 +86,7 @@ public class AdminFeignClientFallback implements AdminFeignClient { } @Override - public Result getGridmanList(EpdcAppGridOperatorFormDTO formDto) { + public Result getGridmanList(EpdcAppGridManFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getGridmanList",formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index 601f91e..b73b33c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -2,7 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; @@ -71,5 +71,5 @@ public interface AdminService { * @author zhangfenghe * @since 2021/8/28 18:41 */ - Result getGridmanList(TokenDto tokenDto, EpdcAppGridOperatorFormDTO formDto); + Result getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index 5377d72..31141ec 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -10,7 +10,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.form.EpdcAppGridOperatorFormDTO; +import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; @@ -124,7 +124,7 @@ public class AdminServiceImpl implements AdminService { } @Override - public Result getGridmanList(TokenDto tokenDto, EpdcAppGridOperatorFormDTO formDto) { + public Result getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto) { if(null == tokenDto){ return new Result().error("获取Token信息失败"); }