From 1c06b5c81f4187f1e9b7f4e5aa96a563637c6c12 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 05 五月 2025 20:30:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
index 29d5f64..eb32bc1 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
@@ -2,7 +2,6 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -66,7 +65,7 @@
public boolean connect() {
boolean result = false;
LfdZyForkLiftMasterThread masterThread = (LfdZyForkLiftMasterThread) SlaveConnection.get(SlaveType.ForkLiftMaster, masterId);
- if(masterThread != null) {
+ if (masterThread != null) {
result = true;
this.masterThread = masterThread;
}
@@ -171,7 +170,7 @@
InnerForkLiftExtend forkLiftExtend = (InnerForkLiftExtend) forkLiftProtocol.getExtend();
forkLiftProtocol.setExtend(forkLiftExtend);
- }else {
+ } else {
OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
}
@@ -224,7 +223,7 @@
//璁惧鐘舵��
basLift.setDeviceStatus(JSON.toJSONString(forkLiftProtocol));
if (basLiftService.updateById(basLift)) {
- OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), forkLiftProtocol.getLiftNo()));
+ OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), forkLiftProtocol.getLiftNo()));
}
} catch (Exception e) {
@@ -313,8 +312,7 @@
&& this.forkLiftProtocol.getWrkNo() == 0
&& this.forkLiftProtocol.getTaskNo() == 0
&& this.forkLiftProtocol.getModel() == 2
- && this.forkLiftProtocol.getErrorCode() == 0
- ;
+ && this.forkLiftProtocol.getErrorCode() == 0;
return res;
}
@@ -343,8 +341,7 @@
boolean res = this.forkLiftProtocol.getProtocolStatus() == ForkLiftProtocolStatusType.IDLE.id
&& this.forkLiftProtocol.getWrkNo() == 0
&& this.forkLiftProtocol.getModel() == 2
- && this.forkLiftProtocol.getErrorCode() == 0
- ;
+ && this.forkLiftProtocol.getErrorCode() == 0;
return res;
}
--
Gitblit v1.9.1