From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java
index c1356f1..392c020 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java
@@ -1,23 +1,18 @@
package org.jeecg.modules.eam.service.impl;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.annotations.ApiModelProperty;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.modules.eam.entity.PredictiveWorkOrder;
-import org.jeecg.modules.eam.entity.PredictiveWorkPlan;
-import org.jeecg.modules.eam.entity.PredictiveWorkPlanWarn;
-import org.jeecg.modules.eam.entity.PredictiveWorkPlanWarnHistory;
+import org.jeecg.common.util.UUIDGenerator;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.PredictiveWorkPlanWarnMapper;
import org.jeecg.modules.eam.model.MdcEquipmentAlarmVo;
import org.jeecg.modules.eam.service.IPredictiveWorkOrderService;
import org.jeecg.modules.eam.service.IPredictiveWorkPlanService;
import org.jeecg.modules.eam.service.IPredictiveWorkPlanWarnHistoryService;
import org.jeecg.modules.eam.service.IPredictiveWorkPlanWarnService;
-import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -79,19 +74,39 @@
}
if (needWarnFlag) {
//鍒ゆ柇鏄惁鐢熸垚宸ュ崟 ,灏嗘姤璀︿俊鎭浠�
- boolean flag = this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
- if (flag) {
- this.backInfo(predictiveWorkPlan.getId(), insertList);
+ PredictiveWorkOrder predictiveWorkOrder = this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
+ if (predictiveWorkOrder != null) {
+ this.backInfo(predictiveWorkPlan.getId(), predictiveWorkOrder.getId(),insertList);
}
}
}
}
- private void backInfo(String workPlanId, List<MdcEquipmentAlarmVo> predictiveWorkPlanWarnList) {
+ @Override
+ public void removeByWorkPlanId(String predictiveWorkPlanId) {
+ LambdaUpdateChainWrapper<PredictiveWorkPlanWarn> lambdaUpdate = this.lambdaUpdate();
+ lambdaUpdate.eq(PredictiveWorkPlanWarn::getWorkPlanId, predictiveWorkPlanId);
+ lambdaUpdate.remove();
+ }
+
+ @Override
+ public void revise(String oldWorkPlanId, String workPlanId) {
+ LambdaQueryChainWrapper<PredictiveWorkPlanWarn> lambdaQuery = this.lambdaQuery();
+ lambdaQuery.eq(PredictiveWorkPlanWarn::getWorkPlanId,oldWorkPlanId).eq(PredictiveWorkPlanWarn::getDelFlag,0);
+ List<PredictiveWorkPlanWarn> insertList = lambdaQuery.list();
+ for(PredictiveWorkPlanWarn predictiveWorkPlanWarn:insertList){
+ predictiveWorkPlanWarn.setWorkPlanId(workPlanId);
+ predictiveWorkPlanWarn.setId(UUIDGenerator.generate());
+ }
+ this.saveBatch(insertList);
+ }
+
+ private void backInfo(String workPlanId, String workOrderId,List<MdcEquipmentAlarmVo> predictiveWorkPlanWarnList) {
List<PredictiveWorkPlanWarnHistory> list = new ArrayList<>();
for (MdcEquipmentAlarmVo mdcEquipmentAlarmVo : predictiveWorkPlanWarnList) {
PredictiveWorkPlanWarnHistory predictiveWorkPlanWarnHistory = new PredictiveWorkPlanWarnHistory();
predictiveWorkPlanWarnHistory.setWorkPlanId(workPlanId);
+ predictiveWorkPlanWarnHistory.setWorkOrderId(workOrderId);
predictiveWorkPlanWarnHistory.setWarnId(mdcEquipmentAlarmVo.getAlarmNo());
predictiveWorkPlanWarnHistory.setWarnCode(mdcEquipmentAlarmVo.getAlarmNo());
predictiveWorkPlanWarnHistory.setWarnName(mdcEquipmentAlarmVo.getAlarmContent());
@@ -101,7 +116,7 @@
predictiveWorkPlanWarnHistoryService.saveBatch(list);
}
- private boolean createOrder(String workPlanId, String equipmentId) {
+ private PredictiveWorkOrder createOrder(String workPlanId, String equipmentId) {
LambdaQueryChainWrapper<PredictiveWorkOrder> lambdaQuery = predictiveWorkOrderService.lambdaQuery();
lambdaQuery.eq(PredictiveWorkOrder::getWorkPlanId, workPlanId).eq(PredictiveWorkOrder::getEquipmentId, equipmentId);
//宸插垱寤� 0 宸蹭笅鍙� 1 鏈紑濮� 2 鎵ц涓� 3
@@ -113,9 +128,9 @@
predictiveWorkOrder.setEquipmentId(equipmentId);
predictiveWorkOrder.setWorkPlanId(workPlanId);
predictiveWorkOrderService.add(predictiveWorkOrder);
- return true;
+ return predictiveWorkOrder;
}
- return false;
+ return null;
}
//鍗曚綅缁熶竴鎹㈢畻涓虹
--
Gitblit v1.9.3