1.将查询LoginUserDetails接口从gov-access移到了epmet-user服务

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LoginUserDetailsFormDTO.java

@@ -0,0 +1,10 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+@Data
+public class LoginUserDetailsFormDTO {
+    private String app;
+    private String client;
+    private String userId;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

@@ -10,11 +10,11 @@ import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.MyResiUserInfoResultDTO;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -111,4 +111,15 @@ public class UserController {
 		return new Result<MyResiUserInfoResultDTO>().ok(userService.resiMyselfMsg(myResiUserInfoFormDTO));
 	}
 
+	/**
+	 * 从缓存中查询已登录用户的基本信息以及角色等相关信息
+	 * @return
+	 */
+	@PostMapping("loginuserdetails")
+	public Result<LoginUserDetailsResultDTO> getLoginUserDetails(@RequestBody LoginUserDetailsFormDTO dto) {
+		ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
+		LoginUserDetailsResultDTO govTokenDto = userService.getLoginUserDetails(dto.getApp(), dto.getClient(), dto.getUserId());
+		return new Result<LoginUserDetailsResultDTO>().ok(govTokenDto);
+	}
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java

@@ -1,19 +1,16 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.MyResiUserInfoResultDTO;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.entity.UserEntity;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Description
  * @IntefaceName UserService
@@ -73,4 +70,10 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2020.05.22 19:24
     **/
     MyResiUserInfoResultDTO resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO);
+
+    /**
+     * 查询登陆用户信息
+     * @return
+     */
+    LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.UserDao;
@@ -42,6 +43,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private GovOrgFeignClient govOrgFeignClient;
     @Autowired
     private UserRoleDao userRoleDao;
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
 
@@ -174,4 +177,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         return null;
     }
+
+    @Override
+    public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String userId) {
+        return cpUserDetailRedis.get(app, client, userId, LoginUserDetailsResultDTO.class);
+    }
 }