From 97d9421515eb1c6aba8958dfb47be36be03dae91 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 11 Dec 2020 17:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AB=AF=E5=88=B0=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E7=94=A8=E6=88=B7=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysUserController.java | 11 +++++++++++ .../esua/epdc/service/SysUserService.java | 10 +++++++++- .../epdc/service/impl/SysUserServiceImpl.java | 15 ++++++++++++++- .../controller/ApiAnalysisUserController.java | 18 +++++++++++++++++- .../esua/epdc/feign/AdminFeignClient.java | 10 ++++++++++ .../fallback/AdminFeignClientFallback.java | 6 +++++- .../elink/esua/epdc/service/AdminService.java | 8 ++++++++ .../epdc/service/impl/AdminServiceImpl.java | 5 +++++ 8 files changed, 79 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index d19bf6d6..94793eb9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -387,6 +387,17 @@ public class SysUserController { ValidatorUtils.validateEntity(epdcScripUserInfoFormDTO); return new Result().ok(sysUserService.getUserInfoByGridAndMobile(epdcScripUserInfoFormDTO)); } + /** + * @Description 根据ID获取临时凭证 + * @Author songyunpeng + * @Date 2020/12/11 + * @Param [epdcScripUserInfoFormDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("getScripBySysUserId/{id}") + public Result getScripBySysUserId(@PathVariable Long id){ + return new Result().ok(sysUserService.getScripBySysUserId(id)); + } /** * @Description 根据临时凭证获取用户信息 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index e1ec23ab..74330003 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -120,7 +120,7 @@ public interface SysUserService extends BaseService { */ Result> getSysGridLeaderPhone(Long deptId); /** - * @Description 根据网格ID和手机号获取用户信息 + * @Description 根据网格ID和手机号获取临时凭证 * @Author songyunpeng * @Date 2020/6/22 * @Param [epdcScripUserInfoFormDTO] @@ -135,4 +135,12 @@ public interface SysUserService extends BaseService { * @return com.elink.esua.epdc.dto.SysUserDTO **/ SysUserDTO getByScrip(String scrip); + /** + * @Description 根据ID获取临时凭证 + * @Author songyunpeng + * @Date 2020/12/11 + * @Param [id] + * @return java.lang.String + **/ + String getScripBySysUserId(Long id); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 9019c472..b7c49a1f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -26,7 +26,6 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.SysUserDao; import com.elink.esua.epdc.dto.SysUserDTO; -import com.elink.esua.epdc.dto.SysUserDeptDTO; import com.elink.esua.epdc.dto.SysUserDeptInfoDTO; import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; @@ -318,5 +317,19 @@ public class SysUserServiceImpl extends BaseServiceImpl + **/ + @PostMapping("getScrip") + public Result getScrip(){ + return adminService.getScripBySysUserId(SecurityUser.getUserId()); + } + /** * 数据分析端-用户凭证登录 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 3bb04b17..c1034109 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -146,6 +146,16 @@ public interface AdminFeignClient { **/ @PostMapping(value = "sys/user/getUserInfoByGridAndMobile", consumes = MediaType.APPLICATION_JSON_VALUE) Result getUserInfoByGridAndMobile(@RequestBody EpdcScripUserInfoFormDTO epdcScripUserInfoFormDTO); + /** + * @Description 根据用户ID获取用户临时凭证 + * @Author songyunpeng + * @Date 2020/12/11 + * @Param [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping(value = "sys/user/getScripBySysUserId/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getScripBySysUserId(@PathVariable Long id); + /** * 获取字典信息 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index a0090c3b..88ef3145 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -10,7 +10,6 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -77,6 +76,11 @@ public class AdminFeignClientFallback implements AdminFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserInfoByGridAndMobile", epdcScripUserInfoFormDTO); } + @Override + public Result getScripBySysUserId(Long id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getScripBySysUserId", id); + } + @Override public Result> listFullDictInfo(String dicType) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listFullDictInfo", dicType); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java index c8d94687..52674525 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -51,4 +51,12 @@ public interface AdminService { * @since 2020/10/12 9:35 */ Result> listFullDictInfo(String dicType); + /** + * @Description 根据用户ID获取临时凭证 + * @Author songyunpeng + * @Date 2020/12/11 + * @Param [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result getScripBySysUserId(Long userId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index d8906502..fff43a31 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -65,4 +65,9 @@ public class AdminServiceImpl implements AdminService { public Result> listFullDictInfo(String dicType) { return adminFeignClient.listFullDictInfo(dicType); } + + @Override + public Result getScripBySysUserId(Long userId) { + return adminFeignClient.getScripBySysUserId(userId); + } }