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/data/VerController.java | 68 +++++++--------------------------
1 files changed, 15 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/VerController.java b/src/main/java/com/lf/server/controller/data/VerController.java
index 11a3411..4bd6682 100644
--- a/src/main/java/com/lf/server/controller/data/VerController.java
+++ b/src/main/java/com/lf/server/controller/data/VerController.java
@@ -1,6 +1,6 @@
package com.lf.server.controller.data;
-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.data.VerEntity;
@@ -33,75 +33,37 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_ver"),
- @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", paramType = "query", example = ""),
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name, String depName) {
- try {
- int count = versionService.selectCount(name, depName);
-
- 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_ver"),
- @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", 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 = "/selectByPage")
- public ResponseMsg<List<VerEntity>> selectByPage(String name, String depName, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
- List<VerEntity> rs = versionService.selectByPage(name, depName, 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 = "1"),
- @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
+ @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 = "/selectByPageAndCount")
- public ResponseMsg<List<VerEntity>> selectByPageAndCount(String name, String depName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<VerEntity>> selectByPageAndCount(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = versionService.selectCount(name, depName);
+ int count = versionService.selectCount(dirid, name);
if (count == 0) {
return success(0, null);
}
- List<VerEntity> rs = versionService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1));
+ List<VerEntity> rs = versionService.selectByPage(dirid, name, 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.data.VersionEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "VersionEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertVersion", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insertVersion(@RequestBody VerEntity entity, HttpServletRequest req) {
@@ -115,7 +77,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -138,7 +100,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -154,7 +116,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -172,7 +134,7 @@
int count = versionService.deleteVersions(ids);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -194,7 +156,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -210,7 +172,7 @@
return success(verEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -222,7 +184,7 @@
List<VerEntity> list = versionService.selectVersionAll();
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3