From 8267cbdb4dc96787e245a794f7ec6b4cadf7d532 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 16:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 126 +++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 19 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 210b453..7ad8f6e 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,28 +1,22 @@
package com.yuanchu.mom.controller;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.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;
import com.yuanchu.mom.utils.RedisUtil;
-import com.yuanchu.mom.utils.ServletUtils;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.DigestUtils;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -40,16 +34,28 @@
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);
+ 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);
@@ -71,10 +77,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);
@@ -84,6 +90,7 @@
return Result.fail(map.get("info"));
}
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -92,6 +99,16 @@
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) {
@@ -99,7 +116,7 @@
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) {
@@ -108,4 +125,75 @@
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(Integer id) {
+ return Result.success(customService.delCustomById(id));
+ }
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
+ @PostMapping("/addCustom")
+ public Result<?> addCustom(@RequestBody Custom custom) {
+ return Result.success(customService.addCustom(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));
+ }
+
}
--
Gitblit v1.9.3