From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 158 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 112 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f1da677..ea0e6b9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,7 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
-import com.core.common.Arith;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -13,6 +13,8 @@
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
@@ -40,21 +42,18 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);add(111);add(112);add(113);add(114);add(115);add(116);add(117);
- add(118);add(119);add(120);add(121);add(122);add(123);add(124);add(125);add(126);add(127);add(128);
- add(200);add(201);add(202);add(203);add(204);add(205);
+ add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
+// add(201);add(202);add(203);add(204);
+// add(301);add(302);add(303);add(304);add(305);add(306);
}};
- public static void main(String[] args) {
- for (Integer siteId : staNos) {
- int divides = (int) Arith.divides(0, siteId, 100);
- int remainder = (int) Arith.remainder(siteId, 100);
- int index = ((divides - 1) * 50) + remainder;
- System.out.print(siteId + " 浠诲姟鍦板潃 锛� " + index*2);
- System.out.print(" 鐩爣鍦板潃 锛� " + (index*2+200) );
- System.out.println(" 鐘舵�� 锛� " + (index+500) );
- }
- }
+ /**
+ * 鏉＄爜鏁伴噺
+ */
+ private int barcodeSize = 1;
+ public IoModeType ioMode = IoModeType.NONE;
+
+ public int[] startSignal = new int[48];
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -80,12 +79,16 @@
case 2:
write((StaProtocol)task.getData());
break;
+ //澶嶄綅娴嬭瘯淇″彿
+ case 3:
+ StaProtocol staProtocol = (StaProtocol)task.getData();
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
+ break;
default:
break;
}
-
// 蹇冭烦
- heartbeat();
+// heartbeat();
Thread.sleep(400);
} catch (Exception e) {
e.printStackTrace();
@@ -117,9 +120,12 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 350);
+// // 鏇存柊鍏ュ嚭搴撴ā寮�
+// updateIoMode();
+ int staNoSize = staNos.size();
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
if (result.IsSuccess) {
- for (int i = 0; i < staNos.size(); i++) {
+ for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -127,36 +133,71 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- int divides = (int) Arith.divides(0, siteId, 100);
- int remainder = (int) Arith.remainder(siteId, 100);
- int index = ((divides - 1) * 50) + remainder;
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, index*2)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, index*2 + 200)); // 鐩爣绔�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
+
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2)); // 鐩爣绔�
}
}
- Thread.sleep(100);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.500", (short) 106);
+// Thread.sleep(200);
+// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
+// if (result0.IsSuccess) {
+// for (int i = 0; i < 93; i++) {
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// StaProtocol staProtocol = station.get(siteId);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(siteId);
+// station.put(siteId, staProtocol);
+// }
+// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
+// }
+// }
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
if (result1.IsSuccess) {
- for (int i = 0; i < staNos.size(); i++) {
+ for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- int divides = (int) Arith.divides(0, siteId, 100);
- int remainder = (int) Arith.remainder(siteId, 100);
- int index = ((divides - 1) * 50) + remainder;
-
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i-1, 1);
- StaProtocol staProtocol = station.get(i);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+ StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
}
}
+
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*12));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*12,12, "UTF-8");
+// String barcode=new String(result2.Content,i*12,12);
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+ }
+
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
+ if(result3.IsSuccess) {
+ for(int i=0; i<48; i++){
+ startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
+ }
+ }
+// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
+// if (result2.IsSuccess) {
+// this.ioMode = IoModeType.get(result2.Content);
+// }
if (result.IsSuccess && result1.IsSuccess) {
@@ -169,18 +210,20 @@
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
}
+
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (!basDevpService.updateBatchById(basDevps)) {
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
} catch (Exception e) {
+ e.printStackTrace();
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
} 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()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
}
@@ -191,17 +234,17 @@
if (null == staProtocol) {
return;
}
- OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(300);
- OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo()); // 鐩爣绔�
-// boolean[] status = new boolean[8];
-// status[0] = staProtocol.isAutoing();
-// status[1] = staProtocol.isLoading();
-// status[2] = staProtocol.isInEnable();
-// status[3] = staProtocol.isOutEnable();
-// status[4] = staProtocol.isEmptyMk();
-// OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status); // 鐘舵��
- if (!write.IsSuccess || !write1.IsSuccess) {
+ int index = staNos.indexOf(staProtocol.getSiteId());
+ short[] array = new short[2];
+ array[0] = staProtocol.getWorkNo();
+ array[1] = staProtocol.getStaNo();
+ OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
+
+// OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+// Thread.sleep(500);
+// OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
+
+ if (!write.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
staProtocol.setPakMk(true);
@@ -211,6 +254,16 @@
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ }
+ }
+
+ // 鏇存柊鍏ュ嚭搴撴ā寮�
+ private void updateIoMode() throws InterruptedException {
+ if (this.ioMode != IoModeType.NONE) {
+ if (!siemensS7Net.Write("DB200", this.ioMode.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ log.error("鍐欏叆杈撻�佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ }
}
}
@@ -245,6 +298,19 @@
siemensS7Net.ConnectClose();
}
+ public static void main(String[] args) {
+ System.out.println(staNos.indexOf(129));
+ System.out.println(staNos.size());
+ for (int i = 0; i<staNos.size(); i++) {
+// System.out.println(i*2);
+// System.out.println(i*2 + 200);
+// System.out.println(i);
+ }
+ int index = staNos.indexOf(128);
+ System.out.println(index*2);
+ System.out.println(index*2 + 200);
+ }
+
// public static void main(String[] args) throws Exception {
// DevpSlave slave = new DevpSlave();
// slave.setIp("192.168.2.125");
--
Gitblit v1.9.1