From 27e9d7d2c7db63c5f12c83e069980213398e8337 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 13 七月 2023 10:22:51 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-12-v1.0.0
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 10 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 a91ab59..e28ea7d 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,13 +1,18 @@
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.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.utils.SpringUtil;
+import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.Result;
+import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
import io.swagger.annotations.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -15,13 +20,11 @@
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 org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -45,7 +48,7 @@
@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()) {
@@ -61,14 +64,25 @@
}
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")
@@ -88,8 +102,41 @@
} catch (Exception e) {
return Result.fail("鐢ㄦ埛id涓虹┖!");
}
-
-
}
+ @PostMapping("/add_new_personnel")
+ @ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠＄悊-->鏂板浜哄憳")
+ public Result<?> addNewPersonnel(@RequestBody NewPersonnelVo newPersonnelVo) {
+ newPersonnelVo.setPassword("123456");
+ Integer isAddSuccess = userService.addNewPersonnel(newPersonnelVo);
+ 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)
+ })
+ public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name) {
+ IPage<PagePersonnelVo> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize));
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", PageList.getRecords());
+ map.put("total", PageList.getTotal());
+ return Result.success(map);
+ }
}
--
Gitblit v1.9.3