控制台修改

user-service/src/main/java/com/diagbot/dto/GetConsoleUserInfoDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.Organization;
+import com.diagbot.entity.User;
+import com.diagbot.entity.UserAuthentication;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 控制台账户信息
+ * @author rgb
+ *
+ */
+@Getter
+@Setter
+public class GetConsoleUserInfoDTO {
+
+    private User user;
+    private Organization organization;
+    private UserAuthentication userAuthentication;
+	
+}

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -1,8 +1,23 @@
 package com.diagbot.facade;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.AuthServiceClient;
+import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -24,19 +39,6 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.UserSaveVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 用户业务层
@@ -285,5 +287,18 @@ public class UserFacade extends UserServiceImpl {
         return super.removeById(id);
     }
 
+	public GetConsoleUserInfoDTO getConsoleUserInfo() {
+		Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+	    User user = this.getById(userId);
+	    Organization organization = organizationFacade.getByUserId(userId);
+	    UserAuthentication userAuthentication = userAuthenticationFacade.getByUserId(userId);
+	        
+	    GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
+	    getConsoleUserInfoDTO.setUser(user);
+	    getConsoleUserInfoDTO.setOrganization(organization);
+	    getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
+	      
+	    return getConsoleUserInfoDTO;
+	}
 
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -1,8 +1,23 @@
 package com.diagbot.web;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -11,22 +26,11 @@ import com.diagbot.entity.User;
 import com.diagbot.facade.PermissionFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserSaveVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Description: 用户操作API
  * @author: gaodm
@@ -216,4 +220,11 @@ public class UserController {
     public RespDTO delUser(Long id){
         return RespDTO.onSuc(userFacade.removeById(id));
     }
+    
+    @ApiOperation(value = "控制台账户信息", notes="控制台账户信息")
+	@PostMapping("/getConsoleUserInfo")
+	@SysLogger("getConsoleUserInfo")
+	public RespDTO<GetConsoleUserInfoDTO> getConsoleUserInfo() {
+		return RespDTO.onSuc(userFacade.getConsoleUserInfo());
+	}
 }