From b2e4845b84b23aa3f9cc01141c74a8a27c56c17a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 13 三月 2023 10:52:39 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/TokenController.java |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 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 1ea83ef..da839dc 100644
--- a/src/main/java/com/lf/server/controller/sys/TokenController.java
+++ b/src/main/java/com/lf/server/controller/sys/TokenController.java
@@ -1,6 +1,6 @@
 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.sys.TokenEntity;
@@ -32,60 +32,63 @@
     @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "浠ょ墝", dataType = "String", paramType = "query", required = false, example = "sys_token")
+            @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 token) {
+    public ResponseMsg<Integer> selectCount(String name,Integer type) {
         try {
-            int count = tokenService.selectCount(token);
+            int count = tokenService.selectCount(name,type);
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "浠ょ墝", dataType = "String", paramType = "query", example = "sys_token"),
+            @ApiImplicitParam(name = "name", value = "浠ょ墝", dataType = "String", paramType = "query", example = ""),
+            @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 = "/selectByPage")
-    public ResponseMsg<List<TokenEntity>> selectByPage(String token, Integer pageSize, Integer pageIndex) {
+    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(token, pageSize, pageSize * (pageIndex - 1));
+            List<TokenEntity> rs = tokenService.selectByPage(name,type, pageSize, pageSize * (pageIndex - 1));
             return success(rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "浠ょ墝", dataType = "String", paramType = "query", example = "sys_token"),
+            @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 = "/selectByPageAndCount")
-    public ResponseMsg<List<TokenEntity>> selectByPageAndCount(String token, 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(token);
+            int count = tokenService.selectCount(name,type);
             if (count == 0) {
                 return success(0, null);
             }
-            List<TokenEntity> rs = tokenService.selectByPage(token, 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);
         }
     }
 
@@ -106,7 +109,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -129,7 +132,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -145,7 +148,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -163,7 +166,7 @@
             int count = tokenService.deleteTokens(ids);
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -185,7 +188,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -201,7 +204,7 @@
 
             return success(tokenEntity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -213,7 +216,7 @@
             List<TokenEntity> list = tokenService.selectTokenAll();
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 }

--
Gitblit v1.9.3