From faa3b0410410415c4ad788c7e0955ef97158df2e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 13 三月 2025 22:37:20 +0800
Subject: [PATCH] 贴膜机任务数据显示异常修改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 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 cf13a3b..ce70431 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,23 +1,72 @@
package com.mes;
-import com.mes.common.S7object;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mes.common.*;
+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;
+import com.mes.md.service.TaskingService;
+import com.mes.plcTaskThread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
@Slf4j
@Component
@Order(1)
public class AppRunnerConfig implements ApplicationRunner {
-
+ @Resource
+ TaskingMapper taskingMapper;
+ @Resource
+ MachineMapper machineMapper;
+ @Resource
+ TaskingService taskingService;
+ @Resource
+ PrimitiveTaskService primitiveTaskService;
+ @Resource
+ LineConfigurationService lineConfigurationService;
+ @Resource
+ PrimitiveTaskMapper primitiveTaskMapper;
@Override
public void run(ApplicationArguments args) throws Exception {
// TODO Auto-generated method stub
- log.info("鍚姩瀹屾垚");
- S7object.getinstance().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> 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: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