From f9aacc433427d9100b07f041e2dc4dc84a086580 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 29 四月 2025 14:12:59 +0800
Subject: [PATCH] art: 设备管理-设备精度参数-接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
index db1d86f..9321f6a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -26,7 +25,7 @@
@Slf4j
@Api(tags="璁惧绮惧害鍙傛暟")
@RestController
-@RequestMapping("/eam/eamEquipmentPrecisionParameters")
+@RequestMapping("/eam/equipmentPrecisionParameters")
public class EamEquipmentPrecisionParametersController extends JeecgController<EamEquipmentPrecisionParameters, IEamEquipmentPrecisionParametersService> {
@Autowired
private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
@@ -46,38 +45,44 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("equipment_id", equipmentId);
Page<EamEquipmentPrecisionParameters> page = new Page<EamEquipmentPrecisionParameters>(pageNo, pageSize);
- IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.page(page, queryWrapper);
+ IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.queryPageList(equipmentId, page);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param eamEquipmentPrecisionParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧绮惧害鍙傛暟-娣诲姞")
@ApiOperation(value="璁惧绮惧害鍙傛暟-娣诲姞", notes="璁惧绮惧害鍙傛暟-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
- eamEquipmentPrecisionParametersService.save(eamEquipmentPrecisionParameters);
+ public Result<?> add(@RequestBody EamEquipmentPrecisionParameters req) {
+ EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
+ if(entity != null){
+ return Result.error("鍙傛暟宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
+ eamEquipmentPrecisionParametersService.save(req);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
* 缂栬緫
*
- * @param eamEquipmentPrecisionParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧绮惧害鍙傛暟-缂栬緫")
@ApiOperation(value="璁惧绮惧害鍙傛暟-缂栬緫", notes="璁惧绮惧害鍙傛暟-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
- eamEquipmentPrecisionParametersService.updateById(eamEquipmentPrecisionParameters);
+ public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters req) {
+ EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.getById(req.getId());
+ if(entity == null){
+ return Result.error("瑕佺紪杈戠殑鍙傛暟涓嶅瓨鍦紝璇峰埛鏂伴噸璇�!");
+ }
+ eamEquipmentPrecisionParametersService.updateById(req);
return Result.OK("缂栬緫鎴愬姛!");
}
--
Gitblit v1.9.3