From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/TokenController.java | 194 ++++++++++++++++++++++++++++++------------------
1 files changed, 122 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/TokenController.java b/src/main/java/com/lf/server/controller/sys/TokenController.java
index dda43d5..b27a3e5 100644
--- a/src/main/java/com/lf/server/controller/sys/TokenController.java
+++ b/src/main/java/com/lf/server/controller/sys/TokenController.java
@@ -1,10 +1,13 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.SettingData;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.sys.TokenEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -18,10 +21,9 @@
/**
* 浠ょ墝琛�
- * @author sws
+ * @author WWW
* @date 2022-09-28
*/
-
@Api(tags = "杩愮淮绠＄悊\\浠ょ墝绠＄悊")
@RestController
@RequestMapping("/token")
@@ -30,72 +32,34 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "浠ょ墝", dataType = "String", paramType = "query", required = false, example = "sys_token"),
- @ApiImplicitParam(name = "type", value = "绫诲瀷", dataType = "Integer", paramType = "query", example = "sys_token"),
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name,Integer type) {
- try {
- int count = tokenService.selectCount(name,type);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "浠ょ墝", dataType = "String", paramType = "query", example = "sys_token"),
- @ApiImplicitParam(name = "type", value = "绫诲瀷", dataType = "Integer", paramType = "query", example = "sys_token"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<TokenEntity>> selectByPage(String name, Integer type,Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
- List<TokenEntity> rs = tokenService.selectByPage(name,type, pageSize, pageSize * (pageIndex - 1));
- return success(rs);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "浠ょ墝", dataType = "String", paramType = "query", example = "sys_token"),
- @ApiImplicitParam(name = "type", value = "绫诲瀷", dataType = "Integer", paramType = "query", example = "sys_token"),
+ @ApiImplicitParam(name = "name", value = "浠ょ墝", dataType = "String", paramType = "query", example = "ec101de8-1403-4d8f-ad13-edab8358399b"),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<TokenEntity>> selectByPageAndCount(String name,Integer type, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<TokenEntity>> selectByPageAndCount(String name, Integer type, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = tokenService.selectCount(name,type);
+ int count = tokenService.selectCount(name, type);
if (count == 0) {
return success(0, null);
}
- List<TokenEntity> rs = tokenService.selectByPage(name,type, pageSize, pageSize * (pageIndex - 1));
+ List<TokenEntity> rs = tokenService.selectByPage(name, type, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.TokenEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "TokenEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertToken", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insertToken(@RequestBody TokenEntity entity, HttpServletRequest req) {
@@ -109,30 +73,36 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯")
+ @ApiOperation(value = "鍒涘缓鏂颁护鐗�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<TokenEntity>", paramType = "body", example = "")
+ @ApiImplicitParam(name = "type", value = "浠ょ墝绫诲埆锛�0-涓存椂锛�1-鍥哄畾", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "min", value = "鍒嗛挓鏁帮細榛樿1涓湀", dataType = "Integer", paramType = "query", example = "43200")
})
- @PostMapping(value = "/insertTokens", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertTokens(@RequestBody List<TokenEntity> list, HttpServletRequest req) {
+ @GetMapping(value = "/insertNewToken")
+ public ResponseMsg<Object> insertNewToken(Integer type, Integer min, HttpServletRequest req) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- for (TokenEntity entity : list) {
- entity.setCreateUser(ue.getId());
- }
+ if (null == type || type > 1) {
+ type = 0;
+ }
+ if (null == min || min < StaticData.I10) {
+ min = SettingData.TOKEN_EXPIRE;
}
- int count = tokenService.insertTokens(list);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ TokenEntity te = tokenService.getNewToken(type, min, ue, req);
+ int rows = tokenService.insertToken(te);
+ if (0 == rows) {
+ return fail("鍒涘缓浠ょ墝澶辫触", null);
+ }
- return success(count);
+ return success(te);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, null);
}
}
@@ -148,7 +118,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -163,10 +133,12 @@
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
+
int count = tokenService.deleteTokens(ids);
+
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -188,14 +160,66 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁ID鏇存柊浠ょ墝涓哄け鏁�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "浠ょ墝ID", dataType = "Integer", paramType = "query", example = "6563")
+ })
+ @GetMapping(value = "/updateExpireById")
+ public ResponseMsg<Integer> updateExpireById(Integer id, HttpServletRequest req) {
+ try {
+ if (null == id || id < 0) {
+ return fail("id鍙傛暟鏃犳晥", 0);
+ }
+ TokenEntity entity = tokenService.selectOneById(id);
+ if (null == entity) {
+ return fail("璇d涓嶅瓨鍦�", 0);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ entity.setUpdateUser(ue.getId());
+ int count = tokenService.updateTokenExpire(entity);
+
+ return success(count);
+ } catch (Exception ex) {
+ return fail(ex, -1);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁Token鏇存柊浠ょ墝涓哄け鏁�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tk", value = "浠ょ墝", dataType = "String", paramType = "query", example = "2edea2a2-e307-4baa-992c-b477ce0566dd")
+ })
+ @GetMapping(value = "/updateExpireByToken")
+ public ResponseMsg<Integer> updateExpireByToken(String tk, HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(tk)) {
+ return fail("token鍙傛暟鏃犳晥", 0);
+ }
+ TokenEntity entity = tokenService.selectOneByToken(tk);
+ if (null == entity) {
+ return fail("璇oken涓嶅瓨鍦ㄦ垨宸插け鏁�", 0);
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ entity.setUpdateUser(ue.getId());
+ int count = tokenService.updateTokenExpire(entity);
+
+ return success(count);
+ } catch (Exception ex) {
+ return fail(ex, -1);
}
}
@SysLog()
@ApiOperation(value = "鏍规嵁ID鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1658")
})
@GetMapping(value = "/selectToken")
public ResponseMsg<TokenEntity> selectToken(int id) {
@@ -204,19 +228,45 @@
return success(tokenEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectTokenAll")
- public ResponseMsg<List<TokenEntity>> selectTokenAll() {
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ(鏈夋晥鏈熷唴鐨�)")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "6563")
+ })
+ @GetMapping(value = "/selectOneById")
+ public ResponseMsg<TokenEntity> selectOneById(Integer id) {
try {
- List<TokenEntity> list = tokenService.selectTokenAll();
- return success(list);
+ if (null == id || id < 0) {
+ return fail("id鍙傛暟鏃犳晥", null);
+ }
+ TokenEntity tokenEntity = tokenService.selectOneById(id);
+
+ return success(tokenEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁token鏌ヨ(鏈夋晥鏈熷唴鐨�)")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tk", value = "浠ょ墝", dataType = "String", paramType = "query", example = "2edea2a2-e307-4baa-992c-b477ce0566dd")
+ })
+ @GetMapping(value = "/selectOneByToken")
+ public ResponseMsg<TokenEntity> selectOneByToken(String tk) {
+ try {
+ if (StringHelper.isEmpty(tk)) {
+ return fail("token鍙傛暟鏃犳晥", null);
+ }
+ TokenEntity tokenEntity = tokenService.selectOneByToken(tk);
+
+ return success(tokenEntity);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3