From 1516a000afd7b2116e0395f769cee8de21ab9e4e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 07 七月 2023 16:58:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index b2eaf01..a91ab59 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -1,27 +1,31 @@
package com.yuanchu.limslaboratory.controller;
+
import com.yuanchu.limslaboratory.clients.UserLoginUtils;
+import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
import com.yuanchu.limslaboratory.utils.SpringUtils;
import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -31,6 +35,9 @@
@RequestMapping("/user")
@Api(tags = "鐢ㄦ埛妯″潡")
public class UserController {
+
+ @Autowired
+ private UserService userService;
@ApiOperation("鐢ㄦ埛鐧诲綍")
@ApiImplicitParams(value = {
@@ -63,4 +70,26 @@
return Result.fail("鐧诲綍澶辫触");
}
}
+
+ @PostMapping("/getUserById")
+ @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛id鐨勭敤鎴蜂俊鎭拰浼佷笟淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鐢ㄦ埛id", name = "userId", dataTypeClass = Integer.class, required = true)
+ })
+ public Result<?> getUserById(int userId) {
+ try {
+ Map<String, String> map = userService.selectUserByUserId(userId);
+ User user = new User(map.get("account"),map.get("uname"),map.get("phone"),map.get("email"),map.get("info"));
+ Enterprise enterprise = new Enterprise(map.get("name"),map.get("byname"),map.get("link_name"),map.get("link_phone"));
+ Map map1 = new HashMap<>();
+ map1.put("enterprise", enterprise);
+ map1.put("user", user);
+ return Result.success(map1);
+ } catch (Exception e) {
+ return Result.fail("鐢ㄦ埛id涓虹┖!");
+ }
+
+
+ }
+
}
--
Gitblit v1.9.3