From ad9527ffab32667ccd79dc85a89de0472278caaf Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Mar 2020 15:34:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/SysUserController.java | 12 ++++++++++++ .../elink/esua/epdc/service/SysUserService.java | 9 +++++++++ .../esua/epdc/service/impl/SysUserServiceImpl.java | 14 ++++++++++++++ .../epdc/controller/ApiWorkUserController.java | 14 ++++++++++++++ .../elink/esua/epdc/feign/AdminFeignClient.java | 10 ++++++++++ .../feign/fallback/AdminFeignClientFallback.java | 5 +++++ .../elink/esua/epdc/service/WorkUserService.java | 9 +++++++++ .../epdc/service/impl/WorkUserServiceImpl.java | 12 ++++++++++++ 8 files changed, 85 insertions(+) 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 466d45411..9ee3224bf 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 @@ -414,4 +414,16 @@ public class SysUserController { return sysUserService.getSysGridLeaderPhone(deptId); } + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:49 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("checkUpdateAvatar") + public Result checkUpdateAvatar() { + return sysUserService.checkUpdateAvatar(); + } + } 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 1a3635e2f..431281af9 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 @@ -118,4 +118,13 @@ public interface SysUserService extends BaseService { * @Date: 2020-01-09 */ Result> getSysGridLeaderPhone(Long deptId); + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:52 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result checkUpdateAvatar(); } 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 f9ded4cc9..c8a0fcd2c 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 @@ -262,5 +262,19 @@ public class SysUserServiceImpl extends BaseServiceImpl>().ok(baseDao.getSysGridLeaderPhone(deptId)); } + @Override + public Result checkUpdateAvatar() { + String userId = SecurityUser.getUser().getId().toString(); + SysUserEntity userInfo = baseDao.selectById(userId); + if(userInfo==null || userInfo.getDelFlag()==1 || userInfo.getStatus()==0){ + throw new RenException("未查到次用户信息或此用户被停用！"); + } + if(StringUtils.isNotBlank(userInfo.getHeadUrl())){ + return new Result().ok(false); + }else{ + return new Result().ok(true); + } + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 5d88fe598..7cf0da9f2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -195,4 +195,18 @@ public class ApiWorkUserController { Long userId = user.getId(); return workUserService.logout(userId); } + + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:32 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("checkUpdateAvatar") + public Result checkUpdateAvatar() { + return workUserService.checkUpdateAvatar(); + } + } 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 9b41b246a..b78436145 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 @@ -90,4 +90,14 @@ public interface AdminFeignClient { **/ @GetMapping("sys/dept/party/getDeptTreeForEpiDemic") Result getDeptTreeForEpiDemic(); + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:43 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("sys/user/checkUpdateAvatar") + Result checkUpdateAvatar(); } 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 e7f13a42d..7ebc6edae 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 @@ -51,4 +51,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getDeptTreeForEpiDemic() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTreeForEpiDemic"); } + + @Override + public Result checkUpdateAvatar() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "checkUpdateAvatar"); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index f3ff61fb5..eb4bcdad1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java @@ -139,4 +139,13 @@ public interface WorkUserService { * @Date 2019/12/25 10:17 **/ Result logout(Long userId); + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:32 + * @param + * @return + */ + Result checkUpdateAvatar(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 06cd13867..4b0c042c2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -335,4 +335,16 @@ public class WorkUserServiceImpl implements WorkUserService { public Result logout(Long userId) { return resourceFeignClient.logoutUser(userId+""); } + + /** + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:42 + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @Override + public Result checkUpdateAvatar() { + return adminFeignClient.checkUpdateAvatar(); + } }