From 1b4fbdb92537036aed4d648967ef7e7ab8842aec Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 十一月 2025 16:37:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index b2ec61c..68e0423 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -3,15 +3,17 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.DeviceDataLog;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
-import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
@@ -21,7 +23,7 @@
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.network.DeviceConnectPool;
-import com.zy.core.network.ZyCrnConnectThread;
+import com.zy.core.network.ZyCrnConnectDriver;
import com.zy.core.network.entity.ZyCrnStatusEntity;
import com.zy.core.thread.CrnThread;
import lombok.Data;
@@ -32,7 +34,6 @@
/**
* 鍫嗗灈鏈虹嚎绋�
- * Created by vincent on 2020/8/4
*/
@Data
@Slf4j
@@ -40,7 +41,7 @@
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
- private ZyCrnConnectThread zyCrnConnectThread;
+ private ZyCrnConnectDriver zyCrnConnectDriver;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
@@ -66,12 +67,15 @@
case 1:
readStatus();
break;
+ case 2:
+ sendCommand((CrnCommand) task.getData());
+ break;
default:
break;
}
Thread.sleep(200);
} catch (Exception e) {
-// e.printStackTrace();
+ e.printStackTrace();
}
}
}
@@ -106,9 +110,9 @@
@Override
public boolean connect() {
SiemensS7Net siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
- ThreadHandler thread = new ZyCrnConnectThread(siemensS7Net, deviceConfig);
- new Thread(thread).start();
- DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), thread);
+ zyCrnConnectDriver = new ZyCrnConnectDriver(siemensS7Net, deviceConfig);
+ new Thread(zyCrnConnectDriver).start();
+ DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyCrnConnectDriver);
return true;
}
@@ -116,7 +120,7 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- ZyCrnStatusEntity crnStatus = zyCrnConnectThread.getStatus();
+ ZyCrnStatusEntity crnStatus = zyCrnConnectDriver.getStatus();
if (crnStatus == null) {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
News.error("SiemensCrn"+" - 5"+" - 璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
@@ -184,11 +188,23 @@
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
}
+
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ if (basCrnpService != null) {
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
+ if(basCrnp == null) {
+ basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(deviceConfig.getDeviceNo());
+ basCrnp.setStatus(1);
+ basCrnp.setCreateTime(new Date());
+ basCrnpService.insert(basCrnp);
+ }
+ }
}
@Override
public void close() {
- zyCrnConnectThread.close();
+ zyCrnConnectDriver.close();
}
@Override
@@ -213,18 +229,15 @@
}
@Override
- public CrnCommand getMoveCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo) {
+ public CrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo) {
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo(taskNo.shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id.shortValue()); // 浠诲姟妯″紡: 鍫嗗灈鏈虹Щ鍔�
- crnCommand.setSourcePosX((short) Utils.getRow(sourceLocNo)); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) Utils.getBay(sourceLocNo)); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) Utils.getLev(sourceLocNo)); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosX((short) Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
crnCommand.setCommand((short) 1); // 浠诲姟纭
return crnCommand;
}
@@ -249,6 +262,6 @@
@Override
public synchronized CommandResponse sendCommand(CrnCommand command) {
this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
- return zyCrnConnectThread.sendCommand(command);
+ return zyCrnConnectDriver.sendCommand(command);
}
}
--
Gitblit v1.9.1