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/sys/ArgsController.java | 96 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/ArgsController.java b/src/main/java/com/lf/server/controller/sys/ArgsController.java
index 873bcb2..af3f642 100644
--- a/src/main/java/com/lf/server/controller/sys/ArgsController.java
+++ b/src/main/java/com/lf/server/controller/sys/ArgsController.java
@@ -1,10 +1,12 @@
package com.lf.server.controller.sys;
-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.sys.ArgsEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.service.sys.ArgsService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -12,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -25,6 +28,9 @@
@Autowired
ArgsService argsService;
+ @Autowired
+ TokenService tokenService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
@@ -37,7 +43,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -59,7 +65,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -84,7 +90,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -97,7 +103,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -113,44 +119,56 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
- @SysLog()
- @ApiOperation(value = "娣诲姞鏁版嵁")
+ /*@SysLog()
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ArgsEntity", paramType = "body")
})
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody ArgsEntity entity) {
+ public ResponseMsg<Integer> insert(@RequestBody ArgsEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
int count = argsService.insert(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺娣诲姞")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ArgsEntity", paramType = "body")
})
@PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> inserts(@RequestBody List<ArgsEntity> list) {
+ public ResponseMsg<Integer> inserts(@RequestBody List<ArgsEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (ArgsEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
int count = argsService.inserts(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")
})
@@ -161,12 +179,12 @@
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 = "Integer", paramType = "query", example = "1,2")
})
@@ -181,41 +199,65 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
- }
+ }*/
@SysLog()
- @ApiOperation(value = "淇敼鏁版嵁")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ArgsEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> update(@RequestBody ArgsEntity entity) {
+ public ResponseMsg<Integer> update(@RequestBody ArgsEntity entity, HttpServletRequest req) {
try {
- int count = argsService.update(entity);
+ ArgsEntity ae = argsService.selectById(entity.getId());
+ if (ae == null) {
+ return fail("鎵句笉鍒板緟鏇存柊鐨勫疄浣�", -1);
+ }
+ if (entity.getCvalue() > ae.getMaxValue() || entity.getCvalue() < ae.getMinValue()) {
+ return fail("寰呮洿鏂扮殑鍊间笉鍦ㄦ湁鏁堣寖鍥村唴", -1);
+ }
+ ae.setCvalue(entity.getCvalue());
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ ae.setUpdateUser(ue.getId());
+ }
+
+ int count = argsService.updateForValue(ae);
+ if (count > 0) {
+ argsService.updateSettingData(ae);
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
- @SysLog()
- @ApiOperation(value = "鎵归噺淇敼")
+ /*@SysLog()
+ @ApiOperation(value = "鏇存柊澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ArgsEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updates(@RequestBody List<ArgsEntity> list) {
+ public ResponseMsg<Integer> updates(@RequestBody List<ArgsEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (ArgsEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
int count = argsService.updates(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
- }
+ }*/
}
--
Gitblit v1.9.3