From d2ce4553e18131b9a60d7be53c496f0cbce699ca Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 08 九月 2023 14:47:47 +0800
Subject: [PATCH] 修改bug
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 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 e28ea7d..6781bd3 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
@@ -3,16 +3,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.clients.UserLoginUtils;
-import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.RoleManagerService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.utils.SpringUtil;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.Result;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import io.swagger.annotations.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -20,9 +22,11 @@
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -41,6 +45,9 @@
@Autowired
private UserService userService;
+
+ @Autowired
+ private RoleManagerService roleManagerService;
@ApiOperation("鐢ㄦ埛鐧诲綍")
@ApiImplicitParams(value = {
@@ -74,6 +81,14 @@
}
}
+ @ApiOperation("鏂板鐢ㄦ埛鑾峰彇瑙掕壊鏉冮檺淇℃伅")
+ @GetMapping("/list")
+ @AuthHandler
+ public Result<?> getUserListRole(){
+ List<Map<String,Object>> data = roleManagerService.getUserListRole();
+ return Result.success(data);
+ }
+
@ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("/info")
public Result<?> getUserInfo(@RequestHeader("X-Token") String token){
@@ -85,30 +100,39 @@
return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
}
+ @ApiOperation("鐧诲綍-->鑾峰彇瑙掕壊淇℃伅")
+ @GetMapping("/roleInfo")
+ public Result<?> getUserRoleInfo(@RequestHeader("X-Token") String token){
+ return Result.success(userService.getUserRoleInfo(token));
+ }
+
@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涓虹┖!");
+ @AuthHandler
+ public Result<?> getUserById(@RequestHeader("X-Token") String token) throws Exception {
+ Object o = RedisUtil.get(token);
+ Map<String, Object> unmarshal = null;
+ if (!ObjectUtils.isEmpty(o)){
+ unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(o), Map.class);
+ Map<String, String> map = userService.selectUserByUserId((Integer) unmarshal.get("id"));
+ return Result.success(map);
}
+ return Result.fail("Token閿欒锛�");
}
@PostMapping("/add_new_personnel")
@ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠＄悊-->鏂板浜哄憳")
- public Result<?> addNewPersonnel(@RequestBody NewPersonnelVo newPersonnelVo) {
- newPersonnelVo.setPassword("123456");
- Integer isAddSuccess = userService.addNewPersonnel(newPersonnelVo);
+ @AuthHandler
+ public Result<?> addNewPersonnel(@RequestHeader("X-Token") String token, @RequestBody NewPersonnelVo newPersonnelVo) throws Exception {
+ Object redisUserMessage = RedisUtil.get(token);
+ Map<String, Object> user = null;
+ Integer isAddSuccess = 0;
+ if (!ObjectUtils.isEmpty(redisUserMessage)) {
+ user = JackSonUtil.unmarshal(JackSonUtil.marshal(redisUserMessage), Map.class);
+ newPersonnelVo.setPassword("123456");
+ isAddSuccess = userService.addNewPersonnel(newPersonnelVo, user.get("enterpriseId").toString());
+ }
+
if (isAddSuccess == 1){
return Result.success("娣诲姞銆�" + newPersonnelVo.getName() + "銆戞垚鍔燂紝榛樿瀵嗙爜涓猴細" + newPersonnelVo.getPassword());
}
@@ -117,6 +141,7 @@
@PutMapping("/update_new_personnel")
@ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠＄悊-->缂栬緫鎿嶄綔")
+ @AuthHandler
public Result<?> updateNewPersonnel(@RequestBody UpdatePersonnelVo updatePersonnelVo) {
Integer isUpdateSuccess = userService.updateNewPersonnel(updatePersonnelVo);
if (isUpdateSuccess == 1){
@@ -130,10 +155,12 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "name", value = "浜哄憳鍚嶇О", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "name", value = "浜哄憳鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "status", value = "鍦ㄨ亴鐘舵��", dataTypeClass = Integer.class)
})
- public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name) {
- IPage<PagePersonnelVo> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize));
+ @AuthHandler
+ public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name, Integer status) {
+ IPage<Map<String, Object>> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
Map<String, Object> map = new HashMap<>();
map.put("row", PageList.getRecords());
map.put("total", PageList.getTotal());
--
Gitblit v1.9.3