diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index cb3ed55f2f..2c5a8fb6f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -263,6 +263,6 @@ public class StaffServiceImpl implements StaffService { */ @Override public Result staffBasicInfo(StaffBasicInfoFromDTO fromDTO) { - return epmetUserOpenFeignClient.staffBasicInfo(fromDTO); + return epmetUserOpenFeignClient.getStaffBasicInfo(fromDTO); } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 6eb7d57801..e7fda8ad3e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -332,6 +332,6 @@ public interface EpmetUserOpenFeignClient { * 根据staffId查询用户基本信息 * @author sun */ - @PostMapping("/epmetuser/customerstaff/staffbasicinfo") - Result staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO); + @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo") + Result getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index ab82bf27f3..9e0c973463 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -222,7 +222,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result staffBasicInfo(StaffBasicInfoFromDTO fromDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffBasicInfo", fromDTO); + public Result getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index 648c0c3456..e8ae592334 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -405,9 +405,9 @@ public class CustomerStaffController { * 根据staffId查询用户基本信息 * @author sun */ - @PostMapping("staffbasicinfo") - public Result staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){ - return new Result().ok(customerStaffService.staffBasicInfo(fromDTO)); + @PostMapping("getstaffbasicinfo") + public Result getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){ + return new Result().ok(customerStaffService.getStaffBasicInfo(fromDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index caaf0400ff..fe3c88e8fb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -320,5 +320,5 @@ public interface CustomerStaffService extends BaseService { * @author sun * @return */ - BasicInfoResultDTO staffBasicInfo(StaffBasicInfoFromDTO fromDTO); + BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 9b8536f981..17f0ae9f5e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -673,7 +673,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl