From 8d58c40af40493bd5f066cbfdb1ffd9f113c22fc Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 03 九月 2025 16:37:21 +0800
Subject: [PATCH] 1.前端推数据使用了最新的webSokect客户现场总是掉线，修改为接口方式 2.设备交互整体增加异常处理以及PLC连接方式改为短连接
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLamination.java | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLamination.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLamination.java
index 325f2b7..154c8b2 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLamination.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLamination.java
@@ -15,69 +15,72 @@
import java.util.Map;
@Slf4j
-public class MachineLamination extends Thread{
+public class MachineLamination extends Thread {
private MachineMapper machineMapper;
private TaskingService taskingService;
private S7objectMachine s7objectMachine;
public Machine thisMachine;
- public MachineLamination(Machine machine, MachineMapper machineMapper, TaskingService taskingService){
+
+ public MachineLamination(Machine machine, MachineMapper machineMapper, TaskingService taskingService) {
this.thisMachine = machine;
this.machineMapper = machineMapper;
this.taskingService = taskingService;
}
- public void plcStart() {
- Machine machine=machineMapper.selectById(thisMachine.getId());
- if (s7objectMachine==null){
- s7objectMachine=new S7objectMachine(machine.getIp(),machine.getPort(),machine.getFileName(), EPlcType.S1200);
- s7objectMachine.start();
- }
- PlcParameterObject plcParameterObject = s7objectMachine.PlcMesObject;
- PlcParameterInfo plcRequest =plcParameterObject.getPlcParameter("plcRequest");//璇锋眰瀛�
- PlcParameterInfo mesSend =plcParameterObject.getPlcParameter("mesSend");//鍙戦�佸瓧
- PlcParameterInfo lengthOutOfService =plcParameterObject.getPlcParameter("length");//闀�
- PlcParameterInfo widthOutOfService =plcParameterObject.getPlcParameter("width");//瀹�
- PlcParameterInfo markingMode =plcParameterObject.getPlcParameter("thickness");//鍘氬害
+ public void plcStart()throws Exception {
+ Machine machine = machineMapper.selectById(thisMachine.getId());
- PlcParameterInfo plcReport =plcParameterObject.getPlcParameter("plcReport");//姹囨姤瀛�
- PlcParameterInfo mesConfirm =plcParameterObject.getPlcParameter("mesConfirm");//纭瀛�
- PlcParameterInfo mesConfirmID =plcParameterObject.getPlcParameter("mesConfirmID");//纭ID
- if (machine.getIsLog()>0){
+ S7objectMachine s7objectMachine = new S7objectMachine(machine.getIp(), machine.getPort(), machine.getFileName(), EPlcType.S1200);
+ s7objectMachine.readData();//鎸夌収json鏂囦欢璇诲彇鍐呭
+ PlcParameterObject plcParameterObject = s7objectMachine.PlcMesObject;
+ if (plcParameterObject == null) {
+ s7objectMachine.plccontrol.closeS7client();
+ return;
+ }
+ try {
+ PlcParameterInfo plcRequest = plcParameterObject.getPlcParameter("plcRequest");//璇锋眰瀛�
+ PlcParameterInfo mesSend = plcParameterObject.getPlcParameter("mesSend");//鍙戦�佸瓧
+ PlcParameterInfo lengthOutOfService = plcParameterObject.getPlcParameter("length");//闀�
+ PlcParameterInfo widthOutOfService = plcParameterObject.getPlcParameter("width");//瀹�
+ PlcParameterInfo markingMode = plcParameterObject.getPlcParameter("thickness");//鍘氬害
+
+ PlcParameterInfo plcReport = plcParameterObject.getPlcParameter("plcReport");//姹囨姤瀛�
+ PlcParameterInfo mesConfirm = plcParameterObject.getPlcParameter("mesConfirm");//纭瀛�
+ PlcParameterInfo mesConfirmID = plcParameterObject.getPlcParameter("mesConfirmID");//纭ID
+ if (machine.getIsLog() > 0) {
s7objectMachine.consoleLogInfo();
}
- if ("0".equals(plcRequest.getValue())&&"1".equals(mesSend.getValue())) {
+ if ("0".equals(plcRequest.getValue()) && "1".equals(mesSend.getValue())) {
//鍙戦�佸瓧缃�0
- log.info("1.鍙戦�佸瓧缃浂,娓呴櫎涓婃鍙戦�佺殑鏁版嵁{}",mesSend.getValue());
+ log.info("1.鍙戦�佸瓧缃浂,娓呴櫎涓婃鍙戦�佺殑鏁版嵁{}", mesSend.getValue());
s7objectMachine.plccontrol.writeWord(mesSend.getAddress(), 0);
return;
}
- if ("0".equals(plcReport.getValue())&&"1".equals(mesConfirm.getValue())) {
+ if ("0".equals(plcReport.getValue()) && "1".equals(mesConfirm.getValue())) {
log.info("2.纭瀛楃疆闆�");
//鍙戦�佸瓧缃�0
s7objectMachine.plccontrol.writeWord(mesConfirm.getAddress(), 0);
return;
}
- if("1".equals(plcReport.getValue())&&"0".equals(mesConfirm.getValue())){
-
-
- int finishCount=taskingService.finishMachineTask(machine);
+ if ("1".equals(plcReport.getValue()) && "0".equals(mesConfirm.getValue())) {
+ int finishCount = taskingService.finishMachineTask(machine);
log.info("3銆佷换鍔″畬鎴�");
- if(finishCount>0){//鏈変换鍔�
+ if (finishCount > 0) {//鏈変换鍔�
s7objectMachine.plccontrol.writeWord(mesConfirm.getAddress(), 1);
return;
}
return;
}
- List<Tasking> taskingCount=taskingService.findMachineWorkStateTask(machine,"姝ｅ湪宸ヤ綔");
- if("1".equals(plcRequest.getValue())&&"0".equals(mesSend.getValue())
- &&"寮�宸�".equals(machine.getState())
- &&taskingCount.size()<machine.getMaxTaskCount()){
+ List<Tasking> taskingCount = taskingService.findMachineWorkStateTask(machine, "姝ｅ湪宸ヤ綔");
+ if ("1".equals(plcRequest.getValue()) && "0".equals(mesSend.getValue())
+ && "寮�宸�".equals(machine.getState())
+ && taskingCount.size() < machine.getMaxTaskCount()) {
- Tasking tasking=taskingService.startMachineTask(machine);
- if(tasking!=null){
- log.info("4銆佸彂閫佹暟鎹�:{},{},{}",tasking.getLength().intValue(),tasking.getWidth().intValue(),1);
+ Tasking tasking = taskingService.startMachineTask(machine);
+ if (tasking != null) {
+ log.info("4銆佸彂閫佹暟鎹�:{},{},{}", tasking.getLength().intValue(), tasking.getWidth().intValue(), 1);
s7objectMachine.plccontrol.writeWord(lengthOutOfService.getAddress(), tasking.getLength().intValue());//x
s7objectMachine.plccontrol.writeWord(widthOutOfService.getAddress(), tasking.getWidth().intValue());//y
@@ -85,16 +88,23 @@
return;
}
}
+ } catch (Exception e) {
+ s7objectMachine.plccontrol.closeS7client();
+ log.info("閫昏緫澶勭悊寮傚父锛氳澶噄d銆恵}銆�", machine.getId());
}
+
+ }
@Override
public void run() {
- while (this != null) {
+ while (true) {
try {
Thread.sleep(1000);
plcStart();
} catch (InterruptedException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ log.info("{}", e.getMessage());
}
}
}
--
Gitblit v1.8.0