From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 15:38:44 +0800
Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 195 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 181 insertions(+), 14 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index ab1a56f..0e34fed 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -1,6 +1,13 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.pojo.Custom;
+import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.CustomService;
+import com.yuanchu.mom.service.PowerService;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
@@ -8,7 +15,8 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
+import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -17,32 +25,49 @@
@RequestMapping("/user")
@RestController
@Api(tags = "鐢ㄦ埛妯″潡")
+@AllArgsConstructor
public class UserController {
- @Autowired
- UserService userService;
+ private UserService userService;
- @Autowired
+ private PowerService powerService;
+
private Jwt jwt;
+
+ private CustomService customService;
@ApiOperation(value = "鐧诲綍")
@PostMapping("/enter")
+ @ValueAuth
public Result login(String account, String password) {
User user = userService.selectUserByPwd(account, password);
- if (user==null) return Result.fail("鐧诲綍澶辫触");
- String jwtToken = jwt.createJwt(user.getName(), user.getId(), 60);
- String jwtReToken = jwt.createJwt(user.getName(), user.getId(), 24 * 60);
- RedisUtil.set("" + user.getId(), jwtToken, 60);
- RedisUtil.set(user.getId() + "Re", jwtReToken, 24 * 60);
- Map<String, String> map = new HashMap<>();
+ if (user == null) return Result.fail("璐﹀彿瀵嗙爜閿欒鎴栬�呰处鍙峰凡琚仠鐢�");
+ String jwtToken;
+ String jwtReToken;
+ if(RedisUtil.hasKey("" + user.getId())){
+ jwtToken = RedisUtil.get("" + user.getId()) + "";
+ }else{
+ jwtToken = jwt.createJwt(user.getName(), user.getId(), 24 * 60);
+ RedisUtil.set("" + user.getId(), jwtToken, 24 * 60);
+ }
+ if(RedisUtil.hasKey(user.getId() + "Re")){
+ jwtReToken = RedisUtil.get(user.getId() + "Re") + "";
+ }else{
+ jwtReToken = jwt.createJwt(user.getName(), user.getId(), 48 * 60);
+ RedisUtil.set(user.getId() + "Re", jwtReToken, 48 * 60);
+ }
+ Map<String, Object> map = new HashMap<>();
map.put("token", jwtToken);
map.put("reToken", jwtReToken);
map.put("name", user.getName());
+ map.put("userId", user.getId());
+ map.put("power", powerService.selectPowerByRoleId(user.getRoleId()));
return Result.success("鐧诲綍鎴愬姛", map);
}
@ApiOperation(value = "token鍒锋柊")
@PostMapping("/refresh")
+ @ValueAuth
public Result refresh(String reToken) throws Exception {
Map<String, String> map = new Jwt().readJWT(reToken);
Map<String, String> maps = JackSonUtil.unmarshal(map.get("data"), Map.class);
@@ -53,10 +78,10 @@
} else if (redisToken.equals(reToken)) {
int id = Integer.parseInt(maps.get("id").replaceAll("\"", ""));
String name = maps.get("name").replaceAll("\"", "");
- String jwtToken = jwt.createJwt(name, id, 60);
- String jwtReToken = jwt.createJwt(name, id, 24 * 60);
- RedisUtil.set("" + id, jwtToken, 60);
- RedisUtil.set(id + "Re", jwtReToken, 24 * 60);
+ String jwtToken = jwt.createJwt(name, id, 24 * 60);
+ String jwtReToken = jwt.createJwt(name, id, 48 * 60);
+ RedisUtil.set("" + id, jwtToken, 24 * 60);
+ RedisUtil.set(id + "Re", jwtReToken, 48 * 60);
Map<String, String> map1 = new HashMap<>();
map1.put("token", jwtToken);
map1.put("reToken", jwtReToken);
@@ -66,4 +91,146 @@
return Result.fail(map.get("info"));
}
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
+ @PostMapping("/selectUserList2")
+ public Result selectUserList2(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectUserList(page, user));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃(鐢ㄤ簬鍏朵粬椤甸潰鑾峰彇鐢ㄦ埛鏁版嵁)")
+ @PostMapping("/selectUserList")
+ public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectUserList(page, user));
+ }
+
+ @ValueClassify("浜哄憳鎬昏")
+ @ApiOperation(value = "鏌ヨ浜哄憳鎬昏")
+ @PostMapping("/selectPersonnelOverview")
+ public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectPersonnelOverview(page, user));
+ }
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
+ @PostMapping("/updateUser")
+ public Result<?> updateUser(@RequestBody User user) {
+ if ("".equals(user.getPassword())) user.setPassword(null);
+ else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
+ return Result.success(userService.updateUser(user));
+ }
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "娣诲姞鐢ㄦ埛淇℃伅")
+ @PostMapping("/addUser")
+ public Result<?> addUser(@RequestBody User user) {
+ if ("".equals(user.getPassword())) user.setPassword(null);
+ else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
+ return Result.success(userService.addUser(user));
+ }
+
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅鏋氫妇")
+ @GetMapping("/getUserMenu")
+ @ValueAuth
+ public Result<?> getUserMenu() {
+ return Result.success(userService.getUserMenu());
+ }
+
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
+ @PostMapping("/selectCustomPageList")
+ public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
+ return Result.success(customService.selectCustomPageList(page, custom));
+ }
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
+ @PostMapping("/delCustomById")
+ public Result<?> delCustomById(Long id) {
+ return Result.success(customService.removeById(id));
+ }
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
+ @PostMapping("/addCustom")
+ public Result<?> addCustom(@RequestBody Custom custom) {
+ return Result.success(customService.addCustom(custom));
+ }
+
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
+ @PostMapping("/upCustom")
+ public Result<?> upCustom(@RequestBody Custom custom) {
+ return Result.success(customService.upCustom(custom));
+ }
+
+ //鑾峰彇璁惧璐熻矗浜�
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
+ @GetMapping("/getDeviceManager")
+ public Result<?> getDeviceManager() {
+ return Result.success(userService.getDeviceManager());
+ }
+
+ @ValueAuth
+ @GetMapping("/getUserNow")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�")
+ public Result<?> getUserNow(){
+ return Result.success(userService.getUserNow());
+ }
+
+ @ValueAuth
+ @GetMapping("/getUserInfo")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
+ public Result<?> getUserInfo(){
+ return Result.success(userService.getUserInfo());
+ }
+
+ @PostMapping("/upUserPassword")
+ @ApiOperation(value = "淇敼鐢ㄦ埛瀵嗙爜")
+ @ValueAuth
+ public Result<?> upUserPassword(String oldPassword, String newPassWord){
+ return Result.success(userService.upUserPassword(oldPassword, newPassWord));
+ }
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @PostMapping("/upUserDepardLimsId")
+ @ApiOperation(value = "淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> upUserDepardLimsId(String ids, String id){
+ return Result.success(userService.upUserDepardLimsId(ids, id));
+ }
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @PostMapping("/delUserDepardLimsId")
+ @ApiOperation(value = "鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> delUserDepardLimsId(Integer id){
+ return Result.success(userService.delUserDepardLimsId(id));
+ }
+
+ @ValueAuth
+ @GetMapping ("/selectCustomEnum")
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+ public Result<?> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
+ @ValueAuth
+ @GetMapping ("/selectUserDepartmentLimsName")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
+ public Result<?> selectUserDepartmentLimsName(){
+ return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
+ }
+
+ @ValueAuth
+ @GetMapping ("/selectDepartmentLimsUserList")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�")
+ public Result<?> selectDepartmentLimsUserList(){
+ return Result.success(userService.selectDepartmentLimsUserList());
+ }
}
--
Gitblit v1.9.3