From 675c3b5d83b928c2bfbb84cd99a7d3f222d4432c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 三月 2026 10:18:16 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2a65490..d6c4e9c 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,9 +5,9 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.exception.CoolException;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.DateUtils;
+import com.zy.acs.framework.exception.CoolException;
import com.zy.asrs.entity.Devp;
import com.zy.asrs.service.DevpService;
import com.zy.asrs.utils.SpringContextUtil;
@@ -17,6 +17,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.TaskType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
@@ -55,7 +56,6 @@
}};
-
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(1);
}};
@@ -86,18 +86,18 @@
connect();
while (true) {
try {
- int step = 1;
+ TaskType step = TaskType.READ;
Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
if (task != null) {
step = task.getStep();
}
switch (step) {
// 璇绘暟鎹�
- case 1:
+ case READ:
read();
break;
// 鍐欐暟鎹� ID+鐩爣绔�
- case 2:
+ case WRITE:
write((StaProtocol) task.getData());
break;
default:
@@ -149,7 +149,7 @@
OperateResult connect = siemensS7Net.ConnectServer();
if (connect.IsSuccess) {
result = true;
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ //OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
News.info("SiemensDevp" + " - 1" + " - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
@@ -209,7 +209,7 @@
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
if (Cools.isEmpty(barcode)) {
barcodeThread.clearBarcode();
- }else {
+ } else {
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
log.info("鏂欑鐮侊細{}", barcode);
@@ -229,7 +229,9 @@
devps.add(staProtocol.toSqlModel());
}
DevpService devpService = SpringContextUtil.getBean(DevpService.class);
- if (null != devpService && !devpService.updateBatchById(devps)) {
+ if (null != devpService) {
+ devpService.updateBatchByDevpNo(devps);
+ } else {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
} catch (Exception e) {
@@ -280,8 +282,6 @@
News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
}
}
-
-
/**
--
Gitblit v1.9.1