From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
index ba57383..324b575 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentPrecisionParametersController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
//import org.jeecg.modules.base.entity.Unit;
//import org.jeecg.modules.base.service.IUnitService;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.PrecisionParameters;
import org.jeecg.modules.eam.service.IEquipmentPrecisionParametersService;
@@ -93,7 +94,40 @@
}
return Result.OK(pageList);
}
-
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentPrecisionParameters
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment_precision_parameters-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/getByEquipmentId")
+ public Result<IPage<EquipmentPrecisionParameters>> getByEquipmentId(EquipmentPrecisionParameters equipmentPrecisionParameters,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EquipmentPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(equipmentPrecisionParameters, req.getParameterMap());
+ Page<EquipmentPrecisionParameters> page = new Page<EquipmentPrecisionParameters>(pageNo, pageSize);
+ IPage<EquipmentPrecisionParameters> pageList = equipmentPrecisionParametersService.page(page, queryWrapper);
+ for (EquipmentPrecisionParameters parameters : pageList.getRecords()) {
+ String precisionParametersId = parameters.getPrecisionParametersId();
+ PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
+ if(precisionParameters != null){
+ parameters.setPrecisionParametersNum(precisionParameters.getNum());
+ parameters.setPrecisionParametersName(precisionParameters.getName());
+ }
+ String upperLimit = parameters.getUpperLimit()+"";
+ String lowerLimit = parameters.getLowerLimit()+"";
+ parameters.setTolerance("["+upperLimit+"鈥�"+lowerLimit+"]");
+ }
+ return Result.OK(pageList);
+ }
+
/**
* 娣诲姞
*
@@ -116,7 +150,7 @@
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -131,7 +165,7 @@
equipmentPrecisionParametersService.updateById(equipmentPrecisionParameters);
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -146,7 +180,7 @@
equipmentPrecisionParametersService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -161,7 +195,7 @@
this.equipmentPrecisionParametersService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -204,4 +238,16 @@
return super.importExcel(request, response, EquipmentPrecisionParameters.class);
}
+ @PutMapping("/submitBatch")
+ public Result<?> submitBatch(@RequestBody List<EquipmentPrecisionParameters> equipmentPrecisionParameters){
+ equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
+ return Result.OK("鎻愪氦鎴愬姛");
+ }
+ @PutMapping("newEdit")
+ public Result<?> newEdit(@RequestBody Equipment equipment){
+ List<EquipmentPrecisionParameters> equipmentPrecisionParameters = equipment.getPrecisionEditTableList();
+ equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
+ return Result.OK("缁存姢鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3