From f1f07a3213a41c6e41bc56d268b7f8e3a67c057d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 10 十月 2022 18:25:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/ResOpController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/ResOpController.java b/src/main/java/com/lf/server/controller/sys/ResOpController.java
index 5df0b09..1a21855 100644
--- a/src/main/java/com/lf/server/controller/sys/ResOpController.java
+++ b/src/main/java/com/lf/server/controller/sys/ResOpController.java
@@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.sql.Timestamp;
import java.util.List;
/**
@@ -29,12 +30,15 @@
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userid", value = "鐧诲綍浜篒D", dataType = "String", paramType = "query", required = false, example = "sys_res_op")
+ @ApiImplicitParam(name = "name", value = "璧勬簮鍚嶇О", dataType = "String", paramType = "query", example = "澶╁湴鍥�"),
+ @ApiImplicitParam(name = "type", value = "鎿嶄綔绫诲瀷", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-10-09 09:00:00"),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-10-10 18:00:00"),
})
@GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String userid) {
+ public ResponseMsg<Integer> selectCount(String name, Integer type, Timestamp start, Timestamp end) {
try {
- int count = resOpService.selectCount(userid);
+ int count = resOpService.selectCount(name, type, start, end);
return success(count);
} catch (Exception ex) {
@@ -45,17 +49,20 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userid", value = "鐧诲綍浜篒D", dataType = "String", paramType = "query", example = "sys_res_op"),
+ @ApiImplicitParam(name = "name", value = "璧勬簮鍚嶇О", dataType = "String", paramType = "query", example = "澶╁湴鍥�"),
+ @ApiImplicitParam(name = "type", value = "鎿嶄綔绫诲瀷", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-10-09 09:00:00"),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-10-10 18:00:00"),
@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<ResOpEntity>> selectByPage(String userid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<ResOpEntity>> selectByPage(String name, Integer type, Timestamp start, Timestamp end, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<ResOpEntity> rs = resOpService.selectByPage(userid, pageSize, pageSize * (pageIndex - 1));
+ List<ResOpEntity> rs = resOpService.selectByPage(name, type, start, end, pageSize, pageSize * (pageIndex - 1));
return success(rs);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
@@ -65,23 +72,26 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userid", value = "鐧诲綍浜篒D", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "name", value = "璧勬簮鍚嶇О", dataType = "String", paramType = "query", example = "澶╁湴鍥�"),
+ @ApiImplicitParam(name = "type", value = "鎿嶄綔绫诲瀷", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-10-09 09:00:00"),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-10-10 18:00:00"),
@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<ResOpEntity>> selectByPageAndCount(String userid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<ResOpEntity>> selectByPageAndCount(String name, Integer type, Timestamp start, Timestamp end, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = resOpService.selectCount(userid);
+ int count = resOpService.selectCount(name, type, start, end);
if (count == 0) {
return success(0, null);
}
- List<ResOpEntity> rs = resOpService.selectByPage(userid, pageSize, pageSize * (pageIndex - 1));
+ List<ResOpEntity> rs = resOpService.selectByPage(name, type, start, end, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
--
Gitblit v1.9.3