From 1cbbb341d22e3c46b15af65b6f97d738bae7ca95 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin>
Date: 星期二, 20 五月 2025 10:46:57 +0800
Subject: [PATCH] 自动化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
index 5df6d68..a2688aa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.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;
@@ -47,38 +46,44 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamEquipmentProcessParameters> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("equipment_id", equipmentId);
- Page<EamEquipmentProcessParameters> page = new Page<EamEquipmentProcessParameters>(pageNo, pageSize);
- IPage<EamEquipmentProcessParameters> pageList = eamEquipmentProcessParametersService.page(page, queryWrapper);
+ Page<EamEquipmentProcessParameters> page = new Page<>(pageNo, pageSize);
+ IPage<EamEquipmentProcessParameters> pageList = eamEquipmentProcessParametersService.queryPageList(equipmentId, page);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param eamEquipmentProcessParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧宸ヨ壓鍙傛暟-娣诲姞")
@ApiOperation(value="璁惧宸ヨ壓鍙傛暟-娣诲姞", notes="璁惧宸ヨ壓鍙傛暟-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentProcessParameters eamEquipmentProcessParameters) {
- eamEquipmentProcessParametersService.save(eamEquipmentProcessParameters);
+ public Result<?> add(@RequestBody EamEquipmentProcessParameters req) {
+ EamEquipmentProcessParameters entity = eamEquipmentProcessParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
+ if(entity != null){
+ return Result.error("鍙傛暟宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
+ eamEquipmentProcessParametersService.save(req);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
* 缂栬緫
*
- * @param eamEquipmentProcessParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧宸ヨ壓鍙傛暟-缂栬緫")
@ApiOperation(value="璁惧宸ヨ壓鍙傛暟-缂栬緫", notes="璁惧宸ヨ壓鍙傛暟-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentProcessParameters eamEquipmentProcessParameters) {
- eamEquipmentProcessParametersService.updateById(eamEquipmentProcessParameters);
+ public Result<?> edit(@RequestBody EamEquipmentProcessParameters req) {
+ EamEquipmentProcessParameters entity = eamEquipmentProcessParametersService.getById(req.getId());
+ if(entity == null){
+ return Result.error("瑕佺紪杈戠殑鍙傛暟涓嶅瓨鍦紝璇峰埛鏂伴噸璇�!");
+ }
+ eamEquipmentProcessParametersService.updateById(req);
return Result.OK("缂栬緫鎴愬姛!");
}
--
Gitblit v1.9.3