From fa095d4c1a440cf28a9ac82aaf9fe26984010670 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 九月 2025 08:48:44 +0800
Subject: [PATCH] 丝印页面修改，通讯加null验证
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java
index 98f963b..4339a36 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,8 +1,9 @@
package com.mes;
-import com.mes.common.*;
-import com.mes.job.PLCLoad;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mes.md.entity.Machine;
import com.mes.md.mapper.MachineMapper;
+import com.mes.md.mapper.PrimitiveTaskMapper;
import com.mes.md.mapper.TaskingMapper;
import com.mes.md.service.LineConfigurationService;
import com.mes.md.service.PrimitiveTaskService;
@@ -15,6 +16,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@Component
@@ -31,14 +33,42 @@
PrimitiveTaskService primitiveTaskService;
@Resource
LineConfigurationService lineConfigurationService;
+ @Resource
+ PrimitiveTaskMapper primitiveTaskMapper;
@Override
public void run(ApplicationArguments args) throws Exception {
// TODO Auto-generated method stub
- new MachineLoad(taskingMapper,machineMapper,taskingService,primitiveTaskService,lineConfigurationService).start();
- new MachineEdging(taskingMapper,machineMapper,taskingService,primitiveTaskService,lineConfigurationService).start();
- new MachineFlipSlice(machineMapper,taskingService).start();
- new MachineMarking(machineMapper,taskingService).start();
- new MachineSilkScreen(machineMapper,taskingService).start();
- new MachineRotate(machineMapper,taskingService).start();
+ List<Machine> machineListLoad =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"涓婄墖").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineListEdging =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"纾ㄨ竟").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineListFlipSlice =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"缈荤墖").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineListMarking =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩鎵撴爣鏈�").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineListSilkScreen =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩涓濆嵃鏈�").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineDispensing =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩鐐硅兌鏈�").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineListRotate =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鏃嬭浆鍙�").eq(Machine::getState,"寮�宸�"));
+ List<Machine> machineListLamination =machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName,"鑷姩璐磋啘鏈�").eq(Machine::getState,"寮�宸�"));
+// for (Machine item:machineListLoad){
+// new MachineLoad(item,primitiveTaskMapper,taskingMapper,machineMapper,taskingService,primitiveTaskService,lineConfigurationService).start();
+// }
+// for (Machine item:machineListEdging){
+// new MachineEdging(item,taskingMapper,machineMapper,taskingService,primitiveTaskService,lineConfigurationService).start();
+// }
+// for (Machine item:machineListFlipSlice){
+// new MachineFlipSlice(item,machineMapper,taskingService).start();
+// }
+// for (Machine item:machineListMarking){
+// new MachineMarking(item,machineMapper,taskingService).start();
+// }
+// for (Machine item:machineListSilkScreen){
+// new MachineSilkScreen(item,machineMapper,taskingService).start();
+// }
+// for (Machine item:machineDispensing){
+// new MachineDispensing(item,machineMapper,taskingService).start();
+// }
+// for (Machine item:machineListRotate){
+// new MachineRotate(item,machineMapper,taskingService).start();
+// }
+// for (Machine item:machineListLamination){
+// new MachineLamination(item,machineMapper,taskingService).start();
+// }
}
}
\ No newline at end of file
--
Gitblit v1.8.0