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/plcTaskThread/MachineSilkScreen.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java
index a3f152a..c6c6d23 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineSilkScreen.java
@@ -21,15 +21,16 @@
private TaskingService taskingService;
public static Long machineId = 14L;
public List<Map> sendRecords = new ArrayList<>();
-
- public MachineSilkScreen(MachineMapper machineMapper, TaskingService taskingService){
+ public Machine thisMachine;
+ public MachineSilkScreen(Machine machine,MachineMapper machineMapper, TaskingService taskingService){
+ this.thisMachine = machine;
this.machineMapper = machineMapper;
this.taskingService = taskingService;
}
- public void plcStart() {
- Machine machine=machineMapper.selectById(machineId);
- String fileName="PlcSilkScreen";
+ public void plcStart() throws Exception{
+ Machine machine=machineMapper.selectById(thisMachine.getId());
+ String fileName=machine.getFileName();
ModbusTcp modbusTcp1 =new ModbusTcp(machine.getIp(),machine.getPort(),fileName);
modbusTcp1.connect();
PlcAgreement plcAgreement=modbusTcp1.getPlcAgreement(fileName);
@@ -191,7 +192,6 @@
} catch (Exception e) {
log.info("浜や簰閫昏緫閿欒");
}
-
modbusTcp1.close();
//log.info("鏃犲彲鎵ц鐨勬潯浠�");
}
@@ -199,12 +199,14 @@
@Override
public void run() {
- while (this != null) {
+ while (true) {
try {
Thread.sleep(1000);
plcStart();
} catch (InterruptedException e) {
e.printStackTrace();
+ }catch (Exception e) {
+ throw new RuntimeException(e);
}
}
}
--
Gitblit v1.8.0