From 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:42:26 +0800
Subject: [PATCH] 开发8-25人员管理与组织架构对接完成
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 12 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..a01ef4c 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,35 @@
package com.yuanchu.limslaboratory.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.clients.UserLoginUtils;
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.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.utils.SpringUtil;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
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 com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
+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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -32,13 +40,16 @@
@Api(tags = "鐢ㄦ埛妯″潡")
public class UserController {
+ @Autowired
+ private UserService userService;
+
@ApiOperation("鐢ㄦ埛鐧诲綍")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "account", value = "璐﹀彿", dataTypeClass = String.class, required = true),
@ApiImplicitParam(name = "password", value = "瀵嗙爜", dataTypeClass = String.class, required = true)
})
@PostMapping("/login")
- public Result<?> UserLogin(String account, String password){
+ public Result<?> userLogin(String account, String password){
boolean loginSuccess = false;
Subject subject = SecurityUtils.getSubject();
if (!subject.isAuthenticated()) {
@@ -54,13 +65,81 @@
}
if (loginSuccess) {
// 鑾峰彇shiroRealm涓殑鏁版嵁
- ShiroRealm bean = SpringUtils.getBean(ShiroRealm.class);
+ ShiroRealm bean = SpringUtil.getBean(ShiroRealm.class);
User user = bean.user;
user.setPassword(null);
- UserLoginUtils bean1 = SpringUtils.getBean(UserLoginUtils.class);
+ UserLoginUtils bean1 = SpringUtil.getBean(UserLoginUtils.class);
return bean1.LoginExamine(user);
}else {
return Result.fail("鐧诲綍澶辫触");
}
}
+
+ @ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
+ @GetMapping("/info")
+ public Result<?> getUserInfo(@RequestHeader("X-Token") String token){
+ //鏍规嵁token鑾峰彇鐢ㄦ埛淇℃伅
+ Map<String,Object> data = userService.getUserInfo(token);
+ if (data != null){
+ return Result.success(data);
+ }
+ return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
+ }
+
+ @PostMapping("/getUserById")
+ @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛id鐨勭敤鎴蜂俊鎭拰浼佷笟淇℃伅")
+ 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(@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());
+ }
+ return Result.fail("娣诲姞澶辫触锛�");
+ }
+
+ @PutMapping("/update_new_personnel")
+ @ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠＄悊-->缂栬緫鎿嶄綔")
+ public Result<?> updateNewPersonnel(@RequestBody UpdatePersonnelVo updatePersonnelVo) {
+ Integer isUpdateSuccess = userService.updateNewPersonnel(updatePersonnelVo);
+ if (isUpdateSuccess == 1){
+ return Result.success("鏇存柊銆�" + updatePersonnelVo.getName() + "銆戞垚鍔�");
+ }
+ return Result.fail("鏇存柊銆�" + updatePersonnelVo.getName() + "銆戝け璐�");
+ }
+
+ @GetMapping("/list_new_personnel")
+ @ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠＄悊-->鍒嗛〉鏌ヨ")
+ @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 = "status", value = "鍦ㄨ亴鐘舵��", dataTypeClass = Integer.class)
+ })
+ 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());
+ return Result.success(map);
+ }
}
--
Gitblit v1.9.3