From c8e5656bd1d02f66b9e6e159da56804f7c7da112 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 09:28:50 +0800
Subject: [PATCH] 12

---
 src/main/java/com/lf/server/controller/data/TaskController.java |   58 ++++------------------------------------------------------
 1 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/TaskController.java b/src/main/java/com/lf/server/controller/data/TaskController.java
index b7fdf81..9b1053d 100644
--- a/src/main/java/com/lf/server/controller/data/TaskController.java
+++ b/src/main/java/com/lf/server/controller/data/TaskController.java
@@ -39,78 +39,28 @@
     PublishService publishService;
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ璁板綍鏁�")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
-    })
-    @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String name) {
-        try {
-            int count = taskService.selectCount(name);
-
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex, -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鍒嗛〉鏌ヨ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", example = ""),
-            @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<TaskEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
-        try {
-            if (pageSize < 1 || pageIndex < 1) {
-                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
-            }
-
-            List<TaskEntity> rs = taskService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
-
-            return success(rs);
-        } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
-
-    @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", example = ""),
+            @ApiImplicitParam(name = "status", value = "浠诲姟鐘舵��", dataType = "Integer", paramType = "query", example = "1"),
             @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<TaskEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = taskService.selectCount(name);
+            int count = taskService.selectCount(name, status);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<TaskEntity> rs = taskService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+            List<TaskEntity> rs = taskService.selectByPage(name, status, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
-        } catch (Exception ex) {
-            return fail(ex, null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ鎵�鏈�")
-    @GetMapping(value = "/selectAll")
-    public ResponseMsg<List<TaskEntity>> selectAll() {
-        try {
-            List<TaskEntity> list = taskService.selectAll();
-
-            return success(list);
         } catch (Exception ex) {
             return fail(ex, null);
         }

--
Gitblit v1.9.3