From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:43:05 +0800
Subject: [PATCH] 部署服务器
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 689 +++++++++++++++++++++++++--------------------------------
1 files changed, 300 insertions(+), 389 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5c16180..6707f1f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,16 +8,13 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
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;
-import com.zy.core.model.protocol.StaError1;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.entity.BasDevp;
import com.zy.service.BasDevpService;
@@ -26,10 +23,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -44,47 +38,88 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- private StaError1 staError1;
- 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(200);add(201);add(202);add(203);add(210);
- add(300);add(301);add(302);add(303);add(304);add(305);
+
+ public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+ add(1001);add(1002);add(1004);add(1005);add(1006);add(1007);add(1008);add(1009);add(1010);add(1011);add(1012);
+ add(1018);add(1017);add(1016);add(1015);add(1014);add(1020);add(1019);add(1013);add(1043);add(1042);add(1041);
+ add(1022);add(1023);add(1024);add(1025);add(1026);add(1027);add(1028);add(1030);add(1031);add(1032);add(1033);
+ add(1034);add(1035);add(1036);add(1038);add(1039);add(1040);
}};
- public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1); add(2);
- }};
- public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(101); add(103);
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(1044);add(1045);add(1046);add(1047);add(1048);add(1049);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);add(1058);
+ add(1061);add(1062);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);add(1072);add(1063);add(1064);add(1065);
+ add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);
+ add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);add(1088);add(1089);add(1090);
}};
- /**
- * 鏉＄爜鏁伴噺
- */
- private int barcodeSize = 2;
+ public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+ add(1091);add(1092);add(1093);add(1094);add(1095);add(1096);add(1097);add(1098);add(1099);add(1100);add(1101);add(1102);
+ add(1103);add(1104);add(1105);add(1106);add(1107);
+ }};
- /**
- * 鍏ュ嚭搴撴ā寮�
- * 0锛氭湭鐭�
- * 1锛氬叆搴撳惎鍔ㄤ腑
- * 2.鍏ュ簱妯″紡
- * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
- * 4.鍑哄簱妯″紡
- */
- public IoModeType ioModeOf101 = IoModeType.NONE;
- public IoModeType ioModeOf103 = IoModeType.NONE;
- public IoModeType ioModeOf305 = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
-// public IoModeType ioModeOf4F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
+ public static final ArrayList<Integer> rgvSiteBackWrkNo1= new ArrayList<Integer>() {{
+ add(1001);add(1006);add(1012);add(1018);add(1019);add(1041);add(1022);add(1026);add(1033);add(1034);
+ }};
+
+ public static final ArrayList<Integer> rgvSiteBackWrkNo2= new ArrayList<Integer>() {{
+ add(1044);
+ }};
+
+ public static final ArrayList<Integer> rgvSiteBackWrkNo3= new ArrayList<Integer>() {{
+ add(1105);add(1100);add(1091);add(1094);add(1097);
+ }};
+
+ public static final ArrayList<Integer> barcodeList = new ArrayList<Integer>() {{
+ add(1); add(2); add(3); add(4);
+ }};
+
+ // 澶栧舰妫�娴�1鍙穚lc
+ public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
+ add(1006); add(1012);add(1018);add(1041);
+ }};
+
+ // 澶栧舰妫�娴�2鍙穚lc
+ public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
+ add(1083); add(1086);add(1089);
+ }};
+
+ // 鍑虹綈瑁呯嚎鍙嶉缁檞cs淇℃伅绔欑偣
+ public static final ArrayList<Integer> gzxResultSite = new ArrayList<Integer>() {{
+ add(1081); add(1084);add(1087);
+ }};
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
}
+ private ArrayList<Integer> getRgvSiteBackWrkNo() {
+ switch (this.slave.getId()) {
+ case 1: return rgvSiteBackWrkNo1;
+ case 2: return rgvSiteBackWrkNo2;
+ case 3: return rgvSiteBackWrkNo3;
+ default:
+ }
+ return new ArrayList<>();
+ }
+
private ArrayList<Integer> getStaNo() {
- return staNos;
+ switch (this.slave.getId()) {
+ case 1: return staNos1;
+ case 2: return staNos2;
+ case 3: return staNos3;
+ default:
+ }
+ return new ArrayList<>();
+ }
+
+ private ArrayList<Integer> getStaNosErrList() {
+ switch (this.slave.getId()) {
+ case 1: return staNosErrList1;
+ case 2: return staNosErrList2;
+ default:
+ }
+ return new ArrayList<>();
}
@Override
@@ -106,11 +141,18 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
- log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
- // 鍐欏紑闂�
+ // 鍐欏熬妗朵俊鍙�
case 3:
- write2((Integer) task.getData());
+ writeTail((StaProtocol)task.getData());
+ break;
+ // 鍐欏叆缃愯绾挎《鍨嬩俊鎭�
+ case 4:
+ writeGzx((StaProtocol)task.getData());
+ break;
+ // 缁欑綈瑁呯嚎鍐欏彲鍑�
+ case 5:
+ writeGzxkc((StaProtocol)task.getData());
break;
default:
break;
@@ -122,41 +164,6 @@
e.printStackTrace();
}
- }
- }
-
- private void write2(int flag) throws InterruptedException {
- if (flag == 0) {
- OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
- if (readOpenResult.IsSuccess) {
- boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
- booleans[1] = true; // 鍏抽棬淇″彿
- booleans[0] = false;
- siemensS7Net.Write("DB100.826",booleans);
- }
- } else if(flag == 1) {
- OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
- if (readOpenResult.IsSuccess) {
- boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
- booleans[0] = true; // 寮�闂ㄤ俊鍙�
- booleans[1] = false;
- siemensS7Net.Write("DB100.826",booleans);
- }
- }
- Thread.sleep(500);
- OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
- if (readOpenResult.IsSuccess) {
- boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
- StaProtocol staProtocol = station.get(305);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(305);
- station.put(305, staProtocol);
- }
- staProtocol.setOpenAskDoor(booleans[0]);
- staProtocol.setCloseAskDoor(booleans[1]);
- staProtocol.setIfOpenDoor(booleans[2]);
- staProtocol.setIfCloseDoor(booleans[3]);
}
}
@@ -210,15 +217,45 @@
/**
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
- private void read() throws InterruptedException {
-// // 鏇存柊鍏ュ嚭搴撴ā寮�
-// updateIoMode();
-// ArrayList<Integer> staNos = getStaNo();
-// int staNoSize = staNos.size();
- // 璇讳竴妤艰繛缁�8涓珯鐐�
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (8*8));
- if (result.IsSuccess) {
- for (int i = 0; i < 8; i++) {
+ private void read() {
+
+ // 璇荤綈瑁呯嚎鍙嶉淇℃伅
+ if (slave.getId() > 3) {
+// log.info("璇诲彇{}鍙风綈瑁呯嚎plc淇℃伅鎴愬姛",slave.getId());
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 58);
+ if (read.IsSuccess) {
+ // 鎴愬搧淇℃伅鍙嶉鍒扮綈瑁呯嚎鍑哄彛绔欑偣
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ StaProtocol staProtocol = devpThread.getStation().get(gzxResultSite.get(slave.getId()-4));
+ if (staProtocol != null) {
+ staProtocol.setWantBucketFlag(siemensS7Net.getByteTransform().TransInt16(read.Content, 0));// 缃愯绾胯妗跺瀷淇″彿
+ staProtocol.setWrkNo(siemensS7Net.getByteTransform().TransInt16(read.Content, 2));
+ double weight208l1 = siemensS7Net.getByteTransform().TransInt32(read.Content, 4); // 200L妗�1鍑�閲�
+ double weight208l2 = siemensS7Net.getByteTransform().TransInt32(read.Content, 8); // 200L妗�2鍑�閲�
+ double weight208l3 = siemensS7Net.getByteTransform().TransInt32(read.Content, 12); // 200L妗�3鍑�閲�
+ double weight208l4 = siemensS7Net.getByteTransform().TransInt32(read.Content, 16); // 200L妗�4鍑�閲�
+ double weight1T = siemensS7Net.getByteTransform().TransInt32(read.Content, 20); // 1T妗跺噣閲�
+// log.info("璇诲彇宸ョ綈瑁呯嚎鍑�閲� 200l妗�1:{},200l妗�2:{},200l妗�3:{},200l妗�4:{},1t妗�:{}",weight208l1,weight208l2,weight208l3,weight208l4,weight1T);
+ staProtocol.setWeight(weight208l1 + weight208l2 + weight208l3 + weight208l4 + weight1T);
+ staProtocol.setGrossWeight(siemensS7Net.getByteTransform().TransInt32(read.Content, 24));
+ staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(read.Content, 28,12,"UTF-8"));
+ staProtocol.setBatch(siemensS7Net.getByteTransform().TransString(read.Content, 40,10,"UTF-8"));
+ staProtocol.setManuDate(siemensS7Net.getByteTransform().TransString(read.Content, 50,8,"UTF-8"));
+ }
+ return;
+ }
+ }
+
+ ArrayList<Integer> staNos = getStaNo();
+ if(staNos == null) {
+ log.error("璇诲彇plc鍦板潃鍧楋紝鑾峰彇绔欑偣鍒楄〃澶辫触");
+ return;
+ }
+
+ // 璇荤珯鐐逛俊鎭弽棣�
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNos.size() * 8));
+ if (result.IsSuccess) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -245,130 +282,82 @@
}
}
}
- // 璇讳簩妤艰繛缁�4涓珯鐐�
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.800", (short) (4*8));
- if (result2.IsSuccess) {
- for (int i = 8; i < 12; 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.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result2.Content, (i-8)*8)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result2.Content, (i-8)*8 + 4)); // 鐩爣绔�
+ // 璇绘晠闅滀俊鎭弽棣�
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.920", (short) (staNos.size()*4));
+ if (resultErr2.IsSuccess) {
+ for (int i = 0; i < staNos.size(); i++) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * 4 + 2, 1);
+ StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
+ staProtocol.setBreakerErr(status[0]);
+ staProtocol.setInfraredErr(status[1]);
+ staProtocol.setOutTimeErr(status[2]);
+ staProtocol.setSeizeSeatErr(status[3]);
+ staProtocol.setWrkYgoodsN(status[4]);
+ staProtocol.setInverterErr(status[5]);
+ staProtocol.setContactErr(status[6]);
+ staProtocol.setUpcontactErr(status[7]);
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result2.Content, (i-8)*8 + 6, 2);
- 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);
- }
}
}
- // 璇讳簩妤�210
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.880", (short) (8));
- if (result3.IsSuccess) {
- Integer siteId = staNos.get(12); // 绔欑偣缂栧彿210
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result3.Content, 0)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result3.Content, 4)); // 鐩爣绔�
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 6, 2);
- 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);
- }
- }
- // 璇讳簩妤�3鍖�
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.1600", (short) (6*8));
- if (result2.IsSuccess) {
- for (int i = 13; i < staNos.size(); 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.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result4.Content, (i-13)*8)); // 宸ヤ綔鍙�
-
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result4.Content, (i-13)*8 + 4)); // 鐩爣绔�
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, (i-13)*8 + 6, 2);
- 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);
- }
+ // 璇籸gv鏀捐揣绔欑偣浠诲姟鍙峰弽棣�
+ ArrayList<Integer> rgvSiteBackWrkNo = getRgvSiteBackWrkNo();
+ OperateResultExOne<byte[]> rgvSiteBackWrkNoResult = siemensS7Net.Read("DB101.1440", (short) (rgvSiteBackWrkNo.size() * 2));
+ if (rgvSiteBackWrkNoResult.IsSuccess) {
+ for (int i = 0; i < rgvSiteBackWrkNo.size(); i ++ ){
+ short hideWrkNo = siemensS7Net.getByteTransform().TransInt16(rgvSiteBackWrkNoResult.Content, i * 2);
+ StaProtocol staProtocol = station.get(getRgvSiteBackWrkNo().get(i));
+ staProtocol.setHideWorkNo((int) hideWrkNo);
}
}
-// BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
- //RGV灏忚溅1
-// Thread.sleep(100);
-// OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
-// if (result3.IsSuccess) {
-// BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
-// if (!Cools.isEmpty(basRgvMap)){
-// Integer siteId = 1;
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setAutoing(true);
-// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
-// }
-// }
- // 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.1672", (short) ((BarcodeList.size()+1) * 8)); // 涓嶈繛缁�
- if (barcodeResult.IsSuccess) {
- for (int i = 0; i < BarcodeList.size(); i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*16,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, BarcodeList.get(i));
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
+ // 璇绘潯鐮佹壂鎻忓櫒
+ if(slave.getId() == 1) {
+ OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
+ if (barcodeResult.IsSuccess) {
+ for (int i = 0; i < barcodeList.size(); i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*8,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeList.get(i));
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
}
}
}
- // 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.1652", (short) ((staNosErrList.size()+1)*4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+ // 璇荤┖妗朵俊鎭弽棣�
+ if (slave.getId() == 1) {
+ OperateResultExOne<byte[]> emptyBucketsResult = siemensS7Net.Read("DB101.1320", (short) (staNosErrList1.size() * 6));
+ if (emptyBucketsResult.IsSuccess) {
+ for (int i = 0; i < staNosErrList1.size(); i++) {
+ // 妗剁被鍨嬫爣璇�
+ int bucketType = siemensS7Net.getByteTransform().TransInt16(emptyBucketsResult.Content, i * 6);
+ // 妗舵暟閲�
+ int bucketCount = siemensS7Net.getByteTransform().TransInt16(emptyBucketsResult.Content, i * 6 + 2);
+ // 灏炬《鏍囪瘑
+ boolean[] tailSupportArray= siemensS7Net.getByteTransform().TransBool(emptyBucketsResult.Content, i * 6 + 4,1);
+ boolean tailSupportFlag = tailSupportArray[0];
+// log.info("绌烘《淇℃伅鍙嶉锛岀珯鐐癸細{}锛屾《绫诲瀷鏍囪瘑锛歿}锛屾暟閲忥細{}锛屽熬妗舵爣璇嗭細{}",staNosErrList1.get(i),bucketType,bucketCount,tailSupportFlag);
+ StaProtocol staProtocol = station.get(staNosErrList1.get(i));
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(staNosErrList1.get(i));
+ station.put(staNosErrList1.get(i), staProtocol);
+ }
+ staProtocol.setBucketType(String.valueOf(bucketType));
+ staProtocol.setBucketCount(bucketCount);
+ staProtocol.setTailSupportFlag(tailSupportFlag);
+ }
+ }
+ }
+
+ // 璇诲褰㈡娴�
+ ArrayList<Integer> staNosErrList = getStaNosErrList();
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNosErrList.size()*4));
if (resultErr.IsSuccess){
for (int i = 0;i<staNosErrList.size();i++){
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*9+2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
StaProtocol staProtocol = station.get(staNosErrList.get(i));
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
@@ -379,162 +368,6 @@
staProtocol.setBarcodeErr(status[6]);
}
}
- // 璇讳竴妤艰繛缁�8涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
- OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.3312", (short) (8*2));
- if (resultErr2.IsSuccess) {
- for (int i = 0; i < 8; i++) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*2 + 1, 1);
- StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
- staProtocol.setOutTimeErr(status[2]);
- staProtocol.setSeizeSeatErr(status[3]);
- staProtocol.setWrkYgoodsN(status[4]);
- staProtocol.setInverterErr(status[5]);
- staProtocol.setContactErr(status[6]);
- staProtocol.setUpcontactErr(status[7]);
-
- }
- }
- // 璇讳簩妤艰繛缁�4涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
- OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB101.3512", (short) (4*2));
- if (resultErr3.IsSuccess) {
- for (int i = 8; i < 12; i++) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, (i-8) * 2 + 1, 1);
- StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
- staProtocol.setOutTimeErr(status[2]);
- staProtocol.setSeizeSeatErr(status[3]);
- staProtocol.setWrkYgoodsN(status[4]);
- staProtocol.setInverterErr(status[5]);
- staProtocol.setContactErr(status[6]);
- staProtocol.setUpcontactErr(status[7]);
- }
- }
- // 璇讳笁鍖烘晠闅滀俊鎭弽棣�
- OperateResultExOne<byte[]> resultErr4 = siemensS7Net.Read("DB101.2096", (short) (6*2));
- if (resultErr4.IsSuccess) {
- for (int i = 13; i < staNos.size(); i++) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr4.Content, (i-13) * 2 + 1, 1);
- StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
- staProtocol.setOutTimeErr(status[2]);
- staProtocol.setSeizeSeatErr(status[3]);
- staProtocol.setWrkYgoodsN(status[4]);
- staProtocol.setInverterErr(status[5]);
- staProtocol.setContactErr(status[6]);
- staProtocol.setUpcontactErr(status[7]);
- }
- }
-
- // 涓�妤煎嚭鍏ュ簱妯″紡鍒囨崲
-// OperateResultExOne<byte[]> ioModeResult = siemensS7Net.Read("DB101.3724", (short) 1);
-// if (ioModeResult.IsSuccess) {
-// boolean[] ioModelBooleans = siemensS7Net.getByteTransform().TransBool(ioModeResult.Content, 0, 1);
-//// log.info("璇诲彇鍑哄叆搴撴ā寮忥細" + Arrays.toString(ioModelBooleans));
-// WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
-// if (ioModelBooleans[0]) { // 100鍒囧叆搴�
-// if (ioModeOf101 == IoModeType.PAKOUT_MODE) {
-// int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
-// .eq("sta_no", 100).in("wrk_sts", 12, 13, 14));
-// if (outCount == 0) {
-// boolean[] booleans = new boolean[8];
-// booleans[0]=true;
-// ioModeOf101 = IoModeType.PAKIN_MODE;
-// siemensS7Net.Write("DB100.824",booleans);
-// log.info("101鍒囨崲鍏ュ簱妯″紡鎴愬姛");
-// }
-// }
-// }
-// if (ioModelBooleans[1]) { // 100鍒囧嚭搴�
-// if (ioModeOf101 == IoModeType.PAKIN_MODE) {
-// int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
-// .eq("sta_no", 101).in("wrk_sts", 2, 3, 4));
-// if (inCount == 0) {
-// boolean[] booleans = new boolean[8];
-// booleans[0]=true;
-// ioModeOf101 = IoModeType.PAKOUT_MODE;
-// siemensS7Net.Write("DB100.824",booleans);
-// log.info("101鍒囨崲鍑哄簱妯″紡鎴愬姛");
-// }
-// }
-// }
-// if (ioModelBooleans[2]) { // 102鍒囧叆搴�
-// if (ioModeOf103 == IoModeType.PAKOUT_MODE) {
-// int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
-// .eq("sta_no", 102).in("wrk_sts", 12, 13, 14));
-// if (outCount == 0) {
-// boolean[] booleans = new boolean[8];
-// booleans[1]=true;
-// ioModeOf103 = IoModeType.PAKIN_MODE;
-// siemensS7Net.Write("DB100.824",booleans);
-// log.info("103鍒囨崲鍏ュ簱妯″紡鎴愬姛");
-// }
-// }
-// }
-// if (ioModelBooleans[3]) { // 102鍒囧嚭搴�
-// if (ioModeOf103 == IoModeType.PAKIN_MODE) {
-// int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
-// .eq("sta_no", 103).in("wrk_sts", 2, 3, 4));
-// if (inCount == 0) {
-// boolean[] booleans = new boolean[8];
-// booleans[1]=true;
-// ioModeOf103 = IoModeType.PAKOUT_MODE;
-// siemensS7Net.Write("DB100.824",booleans);
-// log.info("103鍒囨崲鍑哄簱妯″紡鎴愬姛");
-// }
-// }
-// }
-// }
-
- // 璇诲紑闂ㄤ俊鍙�
-// OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
-// if (readOpenResult.IsSuccess) {
-// boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
-// StaProtocol staProtocol = station.get(305);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(305);
-// station.put(305, staProtocol);
-// }
-// staProtocol.setOpenAskDoor(booleans[0]);
-// staProtocol.setCloseAskDoor(booleans[1]);
-// staProtocol.setIfOpenDoor(booleans[2]);
-// staProtocol.setIfCloseDoor(booleans[3]);
-//// log.info("寮�闂ㄤ俊鍙凤細" + Arrays.toString(booleans));
-// }
-
-
-//// OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
-//// if (resultErr3.IsSuccess) {
-//// if (staError1 == null){
-//// staError1 = new StaError1();
-// }
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
-// staError1.setEMERGENCY_Stop_Core(status[0]);
-// staError1.setEMERGENCY_STOP1(status[1]);
-// staError1.setEMERGENCY_STOP2(status[2]);
-// staError1.setEMERGENCY_STOP3(status[3]);
-// staError1.setEMERGENCY_STOP4(status[4]);
-//
-// staError1.setDoor_EMERGENCY_STOP1(status[5]);
-// staError1.setDoor_EMERGENCY_STOP2(status[6]);
-// staError1.setDoor_EMERGENCY_STOP3(status[7]);
-// staError1.setDoor_EMERGENCY_STOP4(status[8]);
-// staError1.setDoor_EMERGENCY_STOP5(status[9]);
-// staError1.setDoor_EMERGENCY_STOP6(status[10]);
-//
-// staError1.setDoor_Open_Err1(status[11]);
-// staError1.setDoor_Open_Err1(status[12]);
-// staError1.setDoor_Open_Err1(status[13]);
-// staError1.setDoor_Open_Err1(status[14]);
-// staError1.setDoor_Open_Err1(status[15]);
-// staError1.setDoor_Open_Err1(status[16]);
-//
-// }
-
if (result.IsSuccess) {
@@ -549,9 +382,12 @@
}
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ if(basDevps.size() > 0) {
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ }
}
+
} catch (Exception e) {
initSite();
e.printStackTrace();
@@ -573,41 +409,19 @@
return;
}
- int address = -1;
- switch (staProtocol.getSiteId()) {
- case 100: address = 0; break;
- case 101: address = 4; break;
- case 102: address = 8; break;
- case 103: address = 12; break;
- case 104: address = 16; break;
- case 105: address = 20; break;
- case 106: address = 24; break;
- case 107: address = 28; break;
- case 200: address = 400; break;
- case 201: address = 404; break;
- case 202: address = 408; break;
- case 203: address = 412; break;
- case 210: address = 440; break;
- case 300: address = 800; break;
- case 301: address = 804; break;
- case 302: address = 808; break;
- case 303: address = 812; break;
- case 304: address = 816; break;
- case 305: address = 820; break;
- default:
- }
- if(address == -1) {
- throw new CoolException("鍐欏叆绔欑偣寮傚父锛�" + staProtocol.getSiteId());
- }
+ // 鍙栫珯鐐逛笅鏍囷紝璁＄畻plc鍋忕Щ閲�
+ int i = getStaNo().indexOf(staProtocol.getSiteId());
+
OperateResult write;
OperateResult write1;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write1 = siemensS7Net.Write("DB100." + (address+2), staProtocol.getStaNo()); // 鐩爣绔�
- write = siemensS7Net.Write("DB100." + address, staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
+ write1 = siemensS7Net.Write("DB100." + (i*6 +4), staProtocol.getStaNo()); // 鐩爣绔�
+ write = siemensS7Net.Write("DB100." + (i*6), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
if(write.IsSuccess && write1.IsSuccess){
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛,绔欑偣锛歿},浠诲姟鍙�:{},鐩爣绔欙細{}",staProtocol.getSiteId(),staProtocol.getWorkNo(),staProtocol.getStaNo());
break;
}
else {
@@ -629,14 +443,112 @@
}
}
- // 鏇存柊鍏ュ嚭搴撴ā寮�
- private void updateIoMode() throws InterruptedException {
-// if (this.ioModeOf2F != IoModeType.NONE) {
-// if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-// OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-// News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
-// }
-// }
+ /**
+ * 鍐欏熬妗朵俊鍙�
+ */
+ private void writeTail(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+
+ OperateResult write;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100.600", staProtocol.isTailSupportFlag() ? 1 : 0); // 0 涓嶆槸灏炬《锛�1 鏄熬妗�
+ Thread.sleep(200);
+ if(write.IsSuccess){
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("鍐欏叆灏炬《鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛屾槸鍚﹀熬妗�={},鍐欏叆娆℃暟={}", slave.getId(), staProtocol.isTailSupportFlag(), writeCount);
+ }
+ }while (writeCount<5);
+
+ if (!write.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ熬妗跺懡浠ゆ暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), staProtocol.isTailSupportFlag()));
+ News.error("SiemensDevp"+" - 4"+" - 鍐欏叆灏炬《鍛戒护鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), staProtocol.isTailSupportFlag());
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 鍐欏叆灏炬《鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), staProtocol.isTailSupportFlag()));
+ News.info("SiemensDevp"+" - 5"+" - 鍐欏叆灏炬《鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), staProtocol.isTailSupportFlag());
+ }
+ }
+
+ /**
+ * 鍏ョ綈瑁呯嚎鍓峸cs鍐欐《鍨嬩俊鎭�
+ */
+ private void writeGzx(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+ short[] common = new short[3];
+ common[0] = Short.parseShort(staProtocol.getBucketType());
+ common[1] = (short) staProtocol.getBucketCount();
+ common[2] = staProtocol.getWorkNo().shortValue();
+ OperateResult write;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100.0", common);
+ Thread.sleep(200);
+ if(write.IsSuccess){
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛屾槸鍚﹀熬妗�={},鍐欏叆娆℃暟={}", slave.getId(), staProtocol.isTailSupportFlag(), writeCount);
+ }
+ }while (writeCount<5);
+
+ if (!write.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ熬妗跺懡浠ゆ暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), staProtocol.isTailSupportFlag()));
+ News.error("SiemensDevp"+" - 4"+" - 缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), staProtocol.isTailSupportFlag());
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), staProtocol.isTailSupportFlag()));
+ News.info("SiemensDevp"+" - 5"+" - 缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅鍛戒护涓嬪彂鎴愬姛 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), staProtocol.getBucketType());
+ }
+ }
+
+ /**
+ * 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿
+ */
+ private void writeGzxkc(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+ short[] common = new short[1];
+ common[0] = (short) staProtocol.getPlaceableFlag();
+
+ OperateResult write;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100.6", common);
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.6", (short) 2);
+ if(write.IsSuccess && read.IsSuccess){
+ short i = siemensS7Net.getByteTransform().TransInt16(read.Content, 0);
+ if ( i != 1) {
+ writeCount++;
+ log.error("缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿鎴愬姛锛屼絾鍥炶澶辫触锛氳鍙栧�硷細{},杈撻�佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}", i, slave.getId(), writeCount);
+ continue;
+ }
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿锛歿}澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}", common[0], slave.getId(), writeCount);
+ }
+ }while (writeCount<5);
+
+ if (!write.IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戠粰缃愯绾垮啓鍏ュ彲鍑轰俊鍙峰け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), staProtocol.getPlaceableFlag()));
+ News.error("SiemensDevp"+" - 4"+" - 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), staProtocol.getPlaceableFlag());
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), staProtocol.getPlaceableFlag()));
+ News.info("SiemensDevp"+" - 5"+" - 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿鍛戒护涓嬪彂鎴愬姛 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), staProtocol.getPlaceableFlag());
+ }
}
/**
@@ -675,7 +587,6 @@
slave.setIp("10.10.10.18");
SiemensDevpThread devpThread = new SiemensDevpThread(slave);
devpThread.connect();
- devpThread.write2(0);
devpThread.read();
// // 鍐�
// StaProtocol staProtocol = devpThread.getStation().get(1);
--
Gitblit v1.9.1