From 74c2c28d1ddb7cf5133f099e9c0c5ff605db7969 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 12 十月 2023 10:58:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 5
src/main/resources/application-prod.yml | 244 ++++++++++++++++++++++++++--------------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 80 ++++++++++++-
3 files changed, 233 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index a56ac2c..d32c3b7 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -125,8 +125,9 @@
} else {
OutputQueue.CRN.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());
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
+ initCrnProtocol();
}
siemensNet.ConnectClose();
return result;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b04861f..2ec4a9a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.TaskWrk;
@@ -46,9 +47,28 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- 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(201);add(202);add(203);add(204);add(205);add(206);add(207);add(208);add(209);add(210);add(211);add(212);
+ public static final ArrayList<Integer> staNos1 = 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);
+ }};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(200);add(201);add(202);add(203);
+ add(204);add(205);add(206);add(207);
+ add(208);add(209);add(210);add(211);
+ add(212);add(213);add(214);add(215);
+ add(216);add(217);add(218);add(219);
+ add(220);add(221);add(222);add(223);
+ add(224);add(225);add(226);add(227);
+ add(228);add(229);add(230);add(231);
+ add(232);add(233);add(234);add(235);
+ }};
+ public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+ add(300);add(301);add(302);add(303);
+ add(304);add(305);add(306);add(307);
+ }};
+ public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
+ add(400);add(401);add(402);add(403);
+ add(404);add(405);add(406);add(407);
}};
/**
@@ -66,6 +86,20 @@
*/
public IoModeType ioModeOf2F = IoModeType.NONE;
// public IoModeType ioMode = IoModeType.NONE;
+ private ArrayList<Integer> getStaNo() {
+ switch (slave.getId()) {
+ case 1:
+ return staNos1;
+ case 2:
+ return staNos2;
+ case 3:
+ return staNos3;
+ case 4:
+ return staNos4;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -104,6 +138,33 @@
}
}
+ /**
+ * 鍒濆鍖栫珯鐐圭姸鎬�
+ */
+ private void initSite() {
+ ArrayList<Integer> staNos = getStaNo();
+ // 绔欑偣缂栧彿
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo((short) 0); // ID
+ staProtocol.setAutoing(false); // 鑷姩
+ staProtocol.setLoading(false); // 鏈夌墿
+ staProtocol.setInEnable(false); // 鍙叆
+ staProtocol.setOutEnable(false); // 鍙嚭
+ staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
+ staProtocol.setStaNo((short) 0); // 鐩爣绔�
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
+ }
+ }
+
@Override
public boolean connect() {
boolean result = false;
@@ -118,8 +179,9 @@
} 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("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+ initSite();
}
siemensS7Net.ConnectClose();
return result;
@@ -131,6 +193,7 @@
private void read() throws InterruptedException {
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// updateIoMode();
+ ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
if (result.IsSuccess) {
@@ -149,7 +212,7 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize*2));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -186,7 +249,7 @@
//RGV鍙拌溅浣嶇疆
Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)4);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4);
if (result3.IsSuccess) {
for (int i = 0; i < 2; i++) {
Integer siteId = i==0 ? 112 : 212; // 绔欑偣缂栧彿
@@ -246,6 +309,8 @@
if (null == staProtocol) {
return;
}
+ ArrayList<Integer> staNos = getStaNo();
+
int index = staNos.indexOf(staProtocol.getSiteId());
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
@@ -403,6 +468,7 @@
}
public static void main(String[] args) {
+ ArrayList<Integer> staNos = staNos1;
System.out.println(staNos.indexOf(129));
System.out.println(staNos.size());
for (int i = 0; i<staNos.size(); i++) {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index d45ed42..b5494f0 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -10,8 +10,20 @@
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
+ staNo: 200
row: 3
bay: 41
lev: 1
@@ -20,18 +32,6 @@
staNo: 205
row: 4
bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[1]: #鍫嗗灈鏈�2
@@ -42,8 +42,20 @@
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 107
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 104
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
+ staNo: 200
row: 3
bay: 41
lev: 1
@@ -52,18 +64,6 @@
staNo: 205
row: 4
bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[2]: #鍫嗗灈鏈�3
@@ -74,8 +74,20 @@
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
+ staNo: 200
row: 3
bay: 41
lev: 1
@@ -86,28 +98,28 @@
bay: 41
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
crn[3]: #鍫嗗灈鏈�4
id: 4
- ip: 10.10.10.10
+ ip: 192.168.4.250
slot: 0
demo: false
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
+ staNo: 200
row: 3
bay: 41
lev: 1
@@ -116,18 +128,6 @@
staNo: 205
row: 4
bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[4]: #鍫嗗灈鏈�5
@@ -138,8 +138,20 @@
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
+ staNo: 200
row: 3
bay: 41
lev: 1
@@ -148,18 +160,6 @@
staNo: 205
row: 4
bay: 41
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[5]: #鍫嗗灈鏈�6
@@ -170,8 +170,20 @@
rack: 0
offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 103
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 100
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 206
+ staNo: 200
row: 3
bay: 41
lev: 1
@@ -182,40 +194,98 @@
bay: 41
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
- staNo: 110
- row: 4
- bay: 1
- lev: 1
- devpPlcId: ${wcs-slave.devp[0].id}
devp[0]: #杈撻�佺嚎
id: 1
- ip: 10.10.10.30
+ ip: 192.168.4.250
rack: 0
port: 102
- emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
- staNo: 201
- emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+ slot: 0
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
staNo: 101
+ emptyInSta[1]: #绌烘澘鍏ュ簱鍙�1
+ staNo: 105
+ emptyInSta[2]: #绌烘澘鍏ュ簱鍙�2
+ staNo: 109
+ emptyInSta[3]: #绌烘澘鍏ュ簱鍙�3
+ staNo: 113
+ emptyInSta[4]: #绌烘澘鍏ュ簱鍙�4
+ staNo: 117
+ emptyInSta[5]: #绌烘澘鍏ュ簱鍙�5
+ staNo: 121
inSta[0]: #鍏ュ簱鍙�1
scale: ${wcs-slave.scale[0].id}
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
inSta[1]: #鍏ュ簱鍙�2
scale: ${wcs-slave.scale[1].id}
- staNo: 201
+ staNo: 105
+ barcode: ${wcs-slave.barcode[1].id}
+ slot: 0
+ inSta[2]: #鍏ュ簱鍙�1
+ scale: ${wcs-slave.scale[0].id}
+ staNo: 109
+ barcode: ${wcs-slave.barcode[0].id}
+ inSta[3]: #鍏ュ簱鍙�1
+ scale: ${wcs-slave.scale[0].id}
+ staNo: 113
+ barcode: ${wcs-slave.barcode[0].id}
+ inSta[4]: #鍏ュ簱鍙�2
+ scale: ${wcs-slave.scale[1].id}
+ staNo: 117
+ barcode: ${wcs-slave.barcode[1].id}
+ slot: 0
+ inSta[5]: #鍏ュ簱鍙�1
+ scale: ${wcs-slave.scale[0].id}
+ staNo: 121
+ barcode: ${wcs-slave.barcode[0].id}
+ outSta[0]: #鍑哄簱鍙�1
+ staNo: 102
+ outSta[1]: #鍑哄簱鍙�2
+ staNo: 106
+ outSta[2]: #鍑哄簱鍙�2
+ staNo: 110
+ outSta[3]: #鍑哄簱鍙�1
+ staNo: 114
+ outSta[4]: #鍑哄簱鍙�2
+ staNo: 118
+ outSta[5]: #鍑哄簱鍙�2
+ staNo: 122
+ devp[1]: #杈撻�佺嚎
+ id: 2
+ ip: 10.10.10.30
+ rack: 0
+ port: 102
+ slot: 0
+ devp[2]: #杈撻�佺嚎
+ id: 3
+ ip: 10.10.10.30
+ rack: 0
+ slot: 0
+ port: 102
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+ staNo: 306
+ inSta[0]: #鍏ュ簱鍙�1
+ scale: ${wcs-slave.scale[1].id}
+ staNo: 306
barcode: ${wcs-slave.barcode[1].id}
slot: 0
outSta[0]: #鍑哄簱鍙�1
- staNo: 103
- outSta[1]: #鍑哄簱鍙�2
- staNo: 203
+ staNo: 307
+ devp[3]: #杈撻�佺嚎
+ id: 4
+ ip: 10.10.10.30
+ rack: 0
+ slot: 0
+ port: 102
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+ staNo: 406
+ inSta[0]: #鍏ュ簱鍙�1
+ scale: ${wcs-slave.scale[1].id}
+ staNo: 406
+ barcode: ${wcs-slave.barcode[1].id}
+ slot: 0
+ outSta[0]: #鍑哄簱鍙�1
+ staNo: 407
scale[0]: #纾呯Г
port: 5005
ip: 10.10.10.201
--
Gitblit v1.9.1