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 | 128 ++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 72 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 4d4d59a..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,10 +1,12 @@
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;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.service.data.VerService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -12,8 +14,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
-
/**
* 鐗堟湰琛�
@@ -22,113 +24,90 @@
*/
@Api(tags = "鏁版嵁绠＄悊\\鐗堟湰绠＄悊")
@RestController
-@RequestMapping("/version")
+@RequestMapping("/ver")
public class VerController extends BaseController {
@Autowired
VerService versionService;
- @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);
- }
- }
+ @Autowired
+ TokenService tokenService;
@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 = "鎻掑叆瀛楀吀")
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "versionEntity", 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 verEntity) {
+ public ResponseMsg<Integer> insertVersion(@RequestBody VerEntity entity, HttpServletRequest req) {
try {
- int count = versionService.insertVersion(verEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ int count = versionService.insertVersion(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "versionEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<VersionEntity>", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<VersionEntity>", paramType = "body", example = "")
})
@PostMapping(value = "/insertVersions", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertVersions(@RequestParam List<VerEntity> verEntity) {
+ public ResponseMsg<Integer> insertVersions(@RequestParam List<VerEntity> list, HttpServletRequest req) {
try {
- int count = versionService.insertVersions(verEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (VerEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
+ int count = versionService.insertVersions(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉″瓧鍏�")
+ @ApiOperation(value = "鍒犻櫎涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/deleteVersion")
public ResponseMsg<Integer> deleteVersion(int id) {
@@ -137,14 +116,14 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯瀛楀吀")
+ @ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "瀛楀吀ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2")
})
@GetMapping(value = "/deleteVersions")
public ResponseMsg<Integer> deleteVersions(@RequestParam List<Integer> ids) {
@@ -155,31 +134,36 @@
int count = versionService.deleteVersions(ids);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "versionEntity", value = "瀛楀吀ID闆嗗悎", dataType = "VersionEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "VersionEntity", paramType = "body", example = "")
})
@ResponseBody
@PostMapping(value = "/updateVersion", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateVersion(@RequestBody VerEntity verEntity) {
+ public ResponseMsg<Integer> updateVersion(@RequestBody VerEntity entity, HttpServletRequest req) {
try {
- int count = versionService.updateVersion(verEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
+ int count = versionService.updateVersion(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ瀛楀吀")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectVersion")
public ResponseMsg<VerEntity> selectVersion(int id) {
@@ -188,19 +172,19 @@
return success(verEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
+ @ApiOperation(value = "鏌ヨ鎵�鏈�")
@GetMapping(value = "/selectVersionAll")
public ResponseMsg<List<VerEntity>> selectVersionAll() {
try {
List<VerEntity> list = versionService.selectVersionAll();
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3