From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 153 +-------------------------------------------------
1 files changed, 5 insertions(+), 148 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f128698..e3e3703 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,68 +42,11 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
private int barcodeSize = 10;
+
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);
add(102);add(103);
- add(104);add(105);
- add(200);add(201);
- add(202);add(203);
- add(204);add(205);
- add(300);add(301);
- add(340);add(341);
- add(345);add(346);
- add(303);add(317);
- add(325);add(331);
- add(333);add(339);
- add(309);add(312);
}};
-
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(302);add(304);
- add(305);add(306);
- add(307);add(308);
- add(310);add(311);
- add(312);add(313);
- add(314);add(315);
- add(316);add(318);
- add(319);add(320);
- add(321);add(322);
- add(323);add(324);
- add(326);add(327);
- add(328);add(329);
- add(330);add(332);
- add(334);add(335);
- add(336);add(337);
- add(338);add(342);
- add(343);add(344);
- }};
-
- //楂樹綆淇″彿绔欑偣
- public static final ArrayList<Integer> locType1StaNos = new ArrayList<Integer>() {{
- add(100);add(103);
- add(105);add(200);
- add(203);add(205);
- add(300);add(341);
- add(346);
- }};
-
- //鍑哄叆搴撴ā寮�
- public static final ArrayList<Integer> outInModelStaNos = new ArrayList<Integer>() {{
- add(100);add(103);
- add(105);add(200);
- add(203);add(205);
- add(341);add(346);
- }};
-
- //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
- public static final ArrayList<Integer> outInAlarmStaNos = new ArrayList<Integer>(){{
- add(101);add(102);add(104);
- add(201);add(202);add(204);
- add(340);add(345);
- }};
-
- public boolean charge0;
- public boolean charge1;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -135,7 +78,7 @@
}
// 蹇冭烦
// heartbeat();
- Thread.sleep(400);
+ Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
}
@@ -158,7 +101,7 @@
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.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
- siemensS7Net.ConnectClose();
+// siemensS7Net.ConnectClose();
return result;
}
@@ -180,6 +123,7 @@
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4+2)); // 鐩爣绔�
}
}
+
Thread.sleep(200);
OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB1001.0", (short) (staNos.size()*2));
if (result1.IsSuccess) {
@@ -202,94 +146,6 @@
}
}
- //璇绘潯鐮�
- Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 98);
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
- if (i >= 10) {
- continue;
- }
-
- String barcode = null;
- if (i == 8) {
- barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,13, "UTF-8");
- } else if (i == 9) {
- barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8 + 6,13, "UTF-8");
- } else {
- barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
- }
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
- }
- }
-
- //璇婚珮浣庝俊鍙�
- Thread.sleep(100);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB1000.300", (short) (locType1StaNos.size()*2));
- if (result3.IsSuccess) {
- for (int i = 0; i < locType1StaNos.size(); i++) {
- Integer siteId = locType1StaNos.get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result3.Content, i * 2));//璇诲彇楂樹綆淇″彿
- }
- }
-
- //璇诲嚭鍏ュ簱妯″紡
- Thread.sleep(100);
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB1002.0", (short) (outInModelStaNos.size()*2));
- if (result4.IsSuccess) {
- for (int i = 0; i < outInModelStaNos.size(); i++) {
- Integer siteId = outInModelStaNos.get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- staProtocol.setOutInModel(siemensS7Net.getByteTransform().TransInt16(result4.Content, i * 2));//璇诲彇鍑哄叆搴撴ā寮�
- }
- }
-
- //鍑哄叆搴撶珯鐐规娴嬫姤璀︿俊鎭�
- Thread.sleep(100);
- for (Integer staNo : outInAlarmStaNos) {
- OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB" + staNo + ".20.0", (short) 2);
- if (result5.IsSuccess) {
- if (staNo == 101 || staNo == 201) {
- staNo--;
- }else {
- staNo++;
- }
- StaProtocol staProtocol = station.get(staNo);
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 2);
- staProtocol.setBarcodeErr(status[4]);//鎵爜澶辫触
- staProtocol.setFrontErr(status[8]);//鍓嶈秴闄�
- staProtocol.setBackErr(status[9]);//鍚庤秴闄�
- staProtocol.setLeftErr(status[10]);//宸﹁秴闄�
- staProtocol.setRightErr(status[11]);//鍙宠秴闄�
- staProtocol.setHighErr(status[12]);//瓒呴珮
- staProtocol.setWeightErr(status[13]);//瓒呴噸
- }
- }
-
-// Thread.sleep(100);
-// for (Integer staNo : staNos2) {
-// OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB" + staNo + ".0", (short) 48);
-// if (result5.IsSuccess) {
-// StaProtocol staProtocol = station.get(staNo);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(staNo);
-// station.put(staNo, staProtocol);
-// }
-//
-// boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result5.Content, 8, 1);
-// boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result5.Content, 21, 1);
-// staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 34)); // 宸ヤ綔鍙�
-// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 40)); // 鐩爣绔�
-// staProtocol.setAutoing(status1[0]); // 鑷姩
-// staProtocol.setLoading(status2[2]); // 鏈夌墿
-// }
-// }
-
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -299,6 +155,7 @@
for (Integer siteId : staNos) {
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
+// log.info("杈撻�佺嚎淇″彿锛寋}", JSON.toJSONString(staProtocol));
}
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
if (!basDevpService.updateBatchById(basDevps)) {
--
Gitblit v1.9.1