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/show/ModelController.java | 124 +++++++++++++++--------------------------
1 files changed, 46 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ModelController.java b/src/main/java/com/lf/server/controller/show/ModelController.java
index edd4da0..66b7415 100644
--- a/src/main/java/com/lf/server/controller/show/ModelController.java
+++ b/src/main/java/com/lf/server/controller/show/ModelController.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.show.ModelEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.show.ModelService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -21,9 +22,6 @@
* 妯″瀷
* @author WWW
*/
-@Api(tags = "缁煎悎灞曠ず\\妯″瀷")
-@RestController
-@RequestMapping("/model")
public class ModelController extends BaseController {
@Autowired
ModelService modelService;
@@ -32,52 +30,14 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "layerid", value = "鍥惧眰ID", dataType = "Integer", paramType = "query", required = false, example = "")
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(Integer layerid) {
- try {
- int count = modelService.selectCount(layerid);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ妯″瀷骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "layerid", value = "鍥惧眰ID", dataType = "Integer", 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<ModelEntity>> selectByPage(Integer layerid, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- List<ModelEntity> rs = modelService.selectByPage(layerid, pageSize, pageSize * (pageIndex - 1));
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "layerid", value = "鍥惧眰ID", dataType = "Integer", 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<ModelEntity>> selectByPageAndCount(Integer layerid, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectModelByPageAndCount")
+ public ResponseMsg<List<ModelEntity>> selectModelByPageAndCount(Integer layerid, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -97,25 +57,12 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈�")
- @GetMapping(value = "/selectAll")
- public ResponseMsg<List<ModelEntity>> selectAll() {
- try {
- List<ModelEntity> list = modelService.selectAll();
-
- return success(list);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ妯″瀷")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
- @GetMapping(value = "/selectById")
- public ResponseMsg<ModelEntity> selectById(int id) {
+ @GetMapping(value = "/selectModelById")
+ public ResponseMsg<ModelEntity> selectModelById(int id) {
try {
ModelEntity entity = modelService.selectById(id);
@@ -126,12 +73,33 @@
}
@SysLog()
- @ApiOperation(value = "鎻掑叆涓�鏉�")
+ @ApiOperation(value = "鏍规嵁Guid鏌ヨ妯″瀷")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "layerid", value = "鍥惧眰ID", dataType = "Integer", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "modelid", value = "妯″瀷ID", dataType = "String", paramType = "query", example = "")
+ })
+ @GetMapping(value = "/selectModelByGuid")
+ public ResponseMsg<ModelEntity> selectModelByGuid(Integer layerid, String modelid) {
+ try {
+ if (null == layerid || StringHelper.isEmpty(modelid)) {
+ return fail("鍥惧眰ID鍜屾ā鍨婭D涓嶈兘涓虹┖", null);
+ }
+
+ ModelEntity entity = modelService.selectModelByGuid(layerid, modelid);
+
+ return success(entity);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎻掑叆涓�涓ā鍨�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ModelEntity", paramType = "body")
})
- @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody ModelEntity entity, HttpServletRequest req) {
+ @PostMapping(value = "/insertModel", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Integer> insertModel(@RequestBody ModelEntity entity, HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
@@ -147,12 +115,12 @@
}
@SysLog()
- @ApiOperation(value = "鎻掑叆澶氭潯")
+ @ApiOperation(value = "鎻掑叆澶氫釜妯″瀷")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ModelEntity", paramType = "body")
})
- @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> inserts(@RequestBody List<ModelEntity> list, HttpServletRequest req) {
+ @PostMapping(value = "/insertModels", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Integer> insertModels(@RequestBody List<ModelEntity> list, HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
@@ -170,12 +138,12 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉�")
+ @ApiOperation(value = "鍒犻櫎涓�涓ā鍨�")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
- @GetMapping(value = "/delete")
- public ResponseMsg<Integer> delete(int id) {
+ @GetMapping(value = "/deleteModel")
+ public ResponseMsg<Integer> deleteModel(int id) {
try {
int count = modelService.delete(id);
@@ -186,12 +154,12 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎澶氭潯")
+ @ApiOperation(value = "鍒犻櫎澶氫釜妯″瀷")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
- @GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
+ @GetMapping(value = "/deleteModels")
+ public ResponseMsg<Integer> deleteModels(@RequestParam List<Integer> ids) {
try {
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
@@ -206,13 +174,13 @@
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉�")
+ @ApiOperation(value = "鏇存柊涓�涓ā鍨�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ModelEntity", paramType = "body")
})
@ResponseBody
- @PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> update(@RequestBody ModelEntity entity, HttpServletRequest req) {
+ @PostMapping(value = "/updateModel", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Integer> updateModel(@RequestBody ModelEntity entity, HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
@@ -228,13 +196,13 @@
}
@SysLog()
- @ApiOperation(value = "鏇存柊澶氭潯")
+ @ApiOperation(value = "鏇存柊澶氫釜妯″瀷")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ModelEntity", paramType = "body")
})
@ResponseBody
- @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updates(@RequestBody List<ModelEntity> list, HttpServletRequest req) {
+ @PostMapping(value = "/updateModels", produces = "application/json; charset=UTF-8")
+ public ResponseMsg<Integer> updateModels(@RequestBody List<ModelEntity> list, HttpServletRequest req) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
--
Gitblit v1.9.3