代码提交 小程序-首页-网格员列表,FormDTO更新代码提交

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<EpdcAppGridManListResultDTO> getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridOperatorFormDTO formDto){
+    public Result<EpdcAppGridManListResultDTO> getGridmanList(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppGridManFormDTO formDto){
         ValidatorUtils.validateEntity(formDto);
         return adminService.getGridmanList(tokenDto,formDto);
     }

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<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridOperatorFormDTO formDto);
+    Result<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridManFormDTO formDto);
 }

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<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridOperatorFormDTO formDto) {
+    public Result<EpdcAppGridManListResultDTO> getGridmanList(EpdcAppGridManFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER,"getGridmanList",formDto);
     }
 }

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<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridOperatorFormDTO formDto);
+    Result<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto);
 }

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<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridOperatorFormDTO formDto) {
+    public Result<EpdcAppGridManListResultDTO> getGridmanList(TokenDto tokenDto, EpdcAppGridManFormDTO formDto) {
         if(null == tokenDto){
           return  new Result<EpdcAppGridManListResultDTO>().error("获取Token信息失败");
         }