From 52dff0802db6bc1cf90717603f32ccf867fbcb23 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 12 十月 2022 09:42:33 +0800
Subject: [PATCH] token服务修改

---
 src/main/java/com/lf/server/service/sys/TokenService.java       |    8 ++++----
 src/main/java/com/lf/server/mapper/sys/TokenMapper.java         |    8 ++++----
 src/main/java/com/lf/server/controller/sys/TokenController.java |   23 +++++++++++++----------
 src/main/resources/mapper/sys/TokenMapper.xml                   |   18 ++++++++++++++----
 4 files changed, 35 insertions(+), 22 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..dda43d5 100644
--- a/src/main/java/com/lf/server/controller/sys/TokenController.java
+++ b/src/main/java/com/lf/server/controller/sys/TokenController.java
@@ -32,12 +32,13 @@
     @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) {
@@ -48,17 +49,18 @@
     @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 = "/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);
@@ -68,21 +70,22 @@
     @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);
diff --git a/src/main/java/com/lf/server/mapper/sys/TokenMapper.java b/src/main/java/com/lf/server/mapper/sys/TokenMapper.java
index 4a388e2..89aaf17 100644
--- a/src/main/java/com/lf/server/mapper/sys/TokenMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/TokenMapper.java
@@ -18,20 +18,20 @@
     /**
      * 鏌ヨ璁板綍鏁�
      *
-     * @param token 琛ㄥ悕
+     * @param name 琛ㄥ悕
      * @return 璁板綍鏁�
      */
-    public Integer selectCount(String token);
+    public Integer selectCount(String name,Integer type);
 
     /**
      * 鍒嗛〉鏌ヨ
      *
-     * @param token  琛ㄥ悕
+     * @param name  琛ㄥ悕
      * @param limit  璁板綍琛�
      * @param offset 鍋忕Щ閲�
      * @return 鍒楄〃
      */
-    public List<TokenEntity> selectByPage(String token, Integer limit, Integer offset);
+    public List<TokenEntity> selectByPage(String name,Integer type, Integer limit, Integer offset);
 
     /**
      * 鏌ヨ鍗曟潯鏁版嵁
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 31c2720..49dc57d 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -38,13 +38,13 @@
     LoginService loginService;
 
     @Override
-    public Integer selectCount(String token) {
-        return tokenMapper.selectCount(token);
+    public Integer selectCount(String name, Integer type) {
+        return tokenMapper.selectCount(name,type);
     }
 
     @Override
-    public List<TokenEntity> selectByPage(String token, Integer limit, Integer offset) {
-        return tokenMapper.selectByPage(token, limit, offset);
+    public List<TokenEntity> selectByPage(String name, Integer type, Integer limit, Integer offset) {
+        return tokenMapper.selectByPage(name,type, limit, offset);
     }
 
     @Override
diff --git a/src/main/resources/mapper/sys/TokenMapper.xml b/src/main/resources/mapper/sys/TokenMapper.xml
index c369c3a..ed88efd 100644
--- a/src/main/resources/mapper/sys/TokenMapper.xml
+++ b/src/main/resources/mapper/sys/TokenMapper.xml
@@ -13,8 +13,13 @@
     <select id="selectCount" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*) from lf.sys_token
         <where>
-            <if test="token != null">
-                token = #{token}
+            1=1
+            <if test="name != null">
+                and token = #{name}
+            </if>
+
+            <if test="type != null">
+                and type = #{type}
             </if>
         </where>
     </select>
@@ -23,8 +28,13 @@
     <select id="selectByPage" resultMap="resultMap" resultType="com.lf.server.entity.sys.TokenEntity">
         select * from lf.sys_token
         <where>
-            <if test="token != null">
-                token = #{token}
+            1=1
+            <if test="name != null">
+                and token = #{name}
+            </if>
+
+            <if test="type != null">
+                and type = #{type}
             </if>
         </where>
         order by id

--
Gitblit v1.9.3