From e4c2789c8778fd0cc827692b9ebf554411d05673 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 07 三月 2024 11:30:04 +0800
Subject: [PATCH] 完成客户管理
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 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..78811e3 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
@@ -7,8 +7,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.common.PrintChina;
+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;
@@ -40,16 +42,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 +85,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);
@@ -108,4 +122,31 @@
return Result.success(userService.addUser(user));
}
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅鏋氫妇")
+ @GetMapping("/getUserMenu")
+ @ValueAuth
+ public Result<?> getUserMenu() {
+ return Result.success(userService.getUserMenu());
+ }
+
+ @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));
+ }
+
+ @ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
+ @PostMapping("/delCustomById")
+ public Result<?> delCustomById(Integer id) {
+ return Result.success(customService.delCustomById(id));
+ }
+
+ @ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
+ @PostMapping("/addCustom")
+ public Result<?> addCustom(@RequestBody Custom custom) {
+ return Result.success(customService.addCustom(custom));
+ }
+
}
--
Gitblit v1.9.3