Browse Source

判断是否更新头像

dev^2
Jackwang 6 years ago
parent
commit
ad9527ffab
  1. 12
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
  2. 9
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
  3. 14
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
  4. 14
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
  5. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  6. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
  7. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
  8. 12
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

12
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();
}
}

9
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<SysUserEntity> {
* @Date: 2020-01-09
*/
Result<List<String>> getSysGridLeaderPhone(Long deptId);
/**
* @describe: 判断是否更新头像
* @author wangtong
* @date 2020/3/30 13:52
* @param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result checkUpdateAvatar();
}

14
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<SysUserDao, SysUserEntit
return new Result<List<String>>().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);
}
}
}

14
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();
}
}

10
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<DeptOption> 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();
}

5
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<DeptOption> getDeptTreeForEpiDemic() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTreeForEpiDemic");
}
@Override
public Result checkUpdateAvatar() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "checkUpdateAvatar");
}
}

9
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();
}

12
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();
}
}

Loading…
Cancel
Save