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/service/impl/PredictiveWorkPlanParameterServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java
index 1863614..c927c54 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java
@@ -79,8 +79,11 @@
}
if (needCreateFlag) {
//鐢熸垚宸ュ崟 ,灏嗗弬鏁颁俊鎭浠�
- this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
- this.backInfo(predictiveWorkPlan.getId(), predictiveWorkPlanParameterList);
+ PredictiveWorkOrder predictiveWorkOrder = this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
+ if (predictiveWorkOrder != null) {
+ this.backInfo(predictiveWorkPlan.getId(), predictiveWorkOrder.getId(), predictiveWorkPlanParameterList);
+ }
+
}
}
}
@@ -88,34 +91,39 @@
@Override
public void removeByWorkPlanId(String predictiveWorkPlanId) {
LambdaUpdateChainWrapper<PredictiveWorkPlanParameter> lambdaUpdate = this.lambdaUpdate();
- lambdaUpdate.eq(PredictiveWorkPlanParameter::getWorkPlanId,predictiveWorkPlanId);
+ lambdaUpdate.eq(PredictiveWorkPlanParameter::getWorkPlanId, predictiveWorkPlanId);
lambdaUpdate.remove();
}
@Override
public void revise(String oldWorkPlanId, String workPlanId) {
LambdaQueryChainWrapper<PredictiveWorkPlanParameter> lambdaQuery = this.lambdaQuery();
- lambdaQuery.eq(PredictiveWorkPlanParameter::getWorkPlanId,oldWorkPlanId).eq(PredictiveWorkPlanParameter::getDelFlag,0);
+ lambdaQuery.eq(PredictiveWorkPlanParameter::getWorkPlanId, oldWorkPlanId).eq(PredictiveWorkPlanParameter::getDelFlag, 0);
List<PredictiveWorkPlanParameter> insertList = lambdaQuery.list();
- for(PredictiveWorkPlanParameter predictiveWorkPlanParameter:insertList){
+ for (PredictiveWorkPlanParameter predictiveWorkPlanParameter : insertList) {
predictiveWorkPlanParameter.setWorkPlanId(workPlanId);
predictiveWorkPlanParameter.setId(UUIDGenerator.generate());
}
this.saveBatch(insertList);
}
- private void createOrder(String workPlanId, String equipmentId) {
+ private PredictiveWorkOrder createOrder(String workPlanId, String equipmentId) {
PredictiveWorkOrder predictiveWorkOrder = new PredictiveWorkOrder();
predictiveWorkOrder.setWorkPlanId(workPlanId);
predictiveWorkOrder.setEquipmentId(equipmentId);
+ //TODO 寰呴獙璇�
predictiveWorkOrderService.add(predictiveWorkOrder);
+ return predictiveWorkOrder;
}
- private void backInfo(String workPlanId, List<PredictiveWorkPlanParameter> predictiveWorkPlanParameterList) {
+ private void backInfo(String workPlanId, String workOrderId, List<PredictiveWorkPlanParameter> predictiveWorkPlanParameterList) {
List<PredictiveWorkPlanParameterHistory> list = new ArrayList<>();
for (PredictiveWorkPlanParameter predictiveWorkPlanParameter : predictiveWorkPlanParameterList) {
PredictiveWorkPlanParameterHistory predictiveWorkPlanParameterHistory = new PredictiveWorkPlanParameterHistory();
predictiveWorkPlanParameterHistory.setWorkPlanId(workPlanId);
+ //TODO 鍔犲睘鎬orkOrderId
+ predictiveWorkPlanParameterHistory.setWorkOrderId(workOrderId);
+ predictiveWorkPlanParameterHistory.setParameterUnit(predictiveWorkPlanParameter.getParameterUnit());
predictiveWorkPlanParameterHistory.setParameterId(predictiveWorkPlanParameter.getParameterId());
predictiveWorkPlanParameterHistory.setParameterCode(predictiveWorkPlanParameter.getParameterCode());
predictiveWorkPlanParameterHistory.setParameterName(predictiveWorkPlanParameter.getParameterName());
@@ -142,7 +150,21 @@
}
private ParameterVo findParameterInfo(String saveTableName, float lowerLimitValue, float upperLimitValue, String parameterCode) {
- return this.getBaseMapper().findParameterInfo(saveTableName, lowerLimitValue, upperLimitValue, parameterCode);
+// String temp = "[" + saveTableName + "]";
+// return this.getBaseMapper().findParameterInfo(temp, lowerLimitValue, upperLimitValue, parameterCode);
+ Integer lowerLimitValueInt = (int) lowerLimitValue;
+ Integer upperLimitValueInt = (int)upperLimitValue;
+ String sql = "SELECT TOP 1 " +
+ " t1.CollectTime collectTime, " +
+ " t1." + parameterCode + " actualValue " +
+ " FROM " +
+ " [" + saveTableName + "] t1 " +
+ " WHERE " +
+ " t1." + parameterCode + " < " + lowerLimitValueInt +
+ " OR t1." + parameterCode + " > " + upperLimitValueInt +
+ " ORDER BY " +
+ " t1.CollectTime DESC";
+ return this.getBaseMapper().findCommonParameterInfo(sql);
}
private List<PredictiveWorkPlanParameter> listParameter(String predictiveWorkPlanId) {
--
Gitblit v1.9.3