From a38d955f816eb64f297cd587b507defd5839892e Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 09 十二月 2025 15:08:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 1190 +++++++++++++++++++++-------------------------------------
1 files changed, 439 insertions(+), 751 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 22f833c..ba4aeeb 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,11 +9,9 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.mapper.BasRgvMapMapper;
-import com.zy.asrs.mapper.BasRgvMapper;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.service.*;
-import com.zy.common.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -22,15 +20,15 @@
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 lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -40,183 +38,38 @@
@Data
@Slf4j
public class SiemensDevpThread implements Runnable, DevpThread {
- private BasRgvMapMapper basRgvMapMapper;
- private BasRgvMapper basRgvMapper;
+
private DevpSlave slave;
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>() {{
-//
-// }};
+ private boolean result = false;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(1);add(2);//灏忚溅绔欑偣
- add(1001);add(1002);add(1004);
- add(1005);add(1007);
- add(1008);add(1010);
- add(1011);add(1012);add(1014);
- add(1015);add(1016);add(1018);
- add(1019);add(1021);
- add(1022);add(1024);
- add(1025);add(1026);add(1028);
- add(1029);add(1031);
- add(1032);add(1033);add(1034);add(1035);
- add(1036);add(1037);add(1038);
- add(1039);add(1040);add(1041);
- add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);add(1048);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);
- add(1058);add(1059);add(1060);add(1061);add(1062);add(1063);add(1064);add(1065);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);add(1072);
- add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);add(1080);add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);
- add(1088);add(1089);add(1090);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);add(1108);add(1109);add(1110);
+ 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(124);add(125);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(3);add(4);
- add(2001);add(2003);
- add(2004);add(2006);
- add(2007);add(2009);
- add(2010);add(2012);
- add(2013);add(2015);
- add(2016);add(2018);
- add(2019);add(2021);
- add(2022);add(2024);
- add(2028);add(2030);
- add(2025);add(2027);
- add(2031);add(2033);
- add(2034);add(2035);add(2037);
-// add(2041);add(2042);add(2043);add(2044);
-// add(2045);add(2046);add(2047);add(2048);
-// add(2101);add(2102);add(2103);add(2104);add(2105);add(2106);add(2107);add(2108);add(2109);add(2110);
-// add(2111);add(2112);add(2113);add(2114);add(2115);add(2116);add(2117);add(2118);add(2119);add(2120);
- add(4001);add(4003);add(4004);add(4006);
+ 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(224);add(225);
+ }};
+ public static final ArrayList<Integer> staNos1W = new ArrayList<Integer>() {{
+ add(118);add(121);add(124);
}};
- // 绔欑偣鍋忕Щ閲忔槧灏勮〃
- public static final Map<Integer, Integer> siteOffsetMap = new HashMap<Integer, Integer>() {{
- put(1001, 0);put(1002, 116);put(1003, 208);put(1004, 300);put(1005, 392);put(1006, 508);put(1007, 600);
- put(1008, 692);put(1009, 808);put(1010, 900);put(1011, 992);put(1012, 1108);put(1013, 1200);put(1014, 1292);
- put(1015, 1384);put(1016, 1500);put(1017, 1592);put(1018, 1684);put(1019, 1776);put(1020, 1892);put(1021, 1984);
- put(1022, 2076);put(1023, 2192);put(1024, 2284);put(1025, 2376);put(1026, 2492);put(1027, 2584);put(1028, 2676);
- put(1029, 0);put(1030, 116);put(1031, 208);put(1032, 300);put(1033, 416);put(1034, 508);put(1035, 600);
- put(1036, 692);put(1037, 784);put(1038, 876);put(1039, 968);put(1040, 1084);put(1041, 1176);
- put(1042, 0);put(1043, 92);put(1044, 184);put(1045, 276);put(1046, 368);put(1047, 460);
- put(1048, 552);put(1049, 644);put(1050, 736);put(1051, 828);put(1052, 992);put(1053, 1084);
- put(1054, 0);put(1055, 92);put(1056, 256);put(1057, 348);put(1058, 512);put(1059, 604);put(1060, 600);
- put(1061, 788);put(1062, 880);put(1063, 972);put(1064, 1064);put(1065, 1156);put(1066, 1320);put(1067, 1412);
- put(1068, 1576);put(1069, 1668);put(1070, 1832);put(1071, 1924);put(1072, 2016);put(1073, 2108);put(1074, 2200);
- put(1075, 2292);put(1076, 2384);put(1077, 2476);put(1078, 2640);put(1079, 2732);
- put(1080, 0);put(1081, 92);put(1082, 256);put(1083, 348);put(1084, 512);put(1085, 604);put(1086, 696);
- put(1087, 860);put(1088, 952);put(1089, 1044);put(1090, 1208);put(1091, 1300);put(1092, 1392);put(1093, 1556);
- put(1094, 1648);put(1095, 1740);put(1096, 1904);put(1097, 1996);put(1098, 2160);put(1099, 2252);put(1100, 2344);
- put(1101, 2508);put(1102, 2600);put(1103, 2692);put(1104, 2784);put(1105, 2876);
- put(1106, 2968);put(1107, 3060);put(1108, 3152);put(1109, 3244);put(1110, 3336);
-
- put(2001, 392);put(2002, 116);put(2003, 208);put(2004, 0);put(2005, 300);
- put(2006, 508);put(2007, 692);put(2008, 600);put(2009, 808);put(2010, 992);
- put(2011, 900);put(2012, 1108);put(2013, 1500);put(2014, 1292);put(2015, 1200);
- put(2016, 1384);put(2017, 1616);put(2018, 1708);put(2019, 1800);put(2020, 1916);
- put(2021, 2008);put(2022, 2100);put(2023, 2216);put(2024, 2308);put(2025, 2400);
- put(2026, 2516);put(2027, 2608);put(2028, 2792);put(2029, 2700);put(2030, 2908);
- put(2031, 464);put(2032, 348);put(2033, 556);put(2034, 92);put(2035, 0);
- put(2037, 256);
-
- put(4001, 0);put(4002, 116);put(4003, 508);put(4004, 392);put(4005, 300);
- put(4006, 208);
- // 鍏朵粬绔欑偣鍚岀悊缁х画鍔�
+ public static final ArrayList<Integer> staNos2W = new ArrayList<Integer>() {{
+ add(218);add(221);add(224);
}};
+ private boolean connectDev = false;
+ public Long currentTimeMilliConnectDev= 0L;
- // 绔欑偣淇″彿鍋忕Щ閲忔槧灏勮〃
- public static final Map<Integer, Integer> siteOffsetMapSign = new HashMap<Integer, Integer>() {{
- put(1001, 0);put(1002, 4);put(1003, 8);put(1004, 12);put(1005, 16);put(1006, 20);put(1007, 24);
- put(1008, 28);put(1009, 32);put(1010, 36);put(1011, 40);put(1012, 44);put(1013, 48);put(1014, 52);
- put(1015, 56);put(1016, 60);put(1017, 64);put(1018, 68);put(1019, 72);put(1020, 76);put(1021, 80);
- put(1022, 84);put(1023, 88);put(1024, 92);put(1025, 96);put(1026, 100);put(1027, 104);put(1028, 108);
- put(1029, 112);put(1030, 116);put(1031, 120);put(1032, 124);put(1033, 128);put(1034, 132);put(1035, 136);
- put(1036, 140);put(1037, 144);put(1038, 148);put(1039, 152);put(1040, 156);put(1041, 160);
-
- put(1042, 392);put(1043, 396);put(1044, 400);put(1045, 404);put(1046, 408);put(1047, 412);
- put(1048, 416);put(1049, 420);put(1050, 424);put(1051, 428);put(1052, 432);put(1053, 436);
-
- put(1054, 288);put(1055, 292);put(1056, 296);put(1057, 300);put(1058, 304);put(1059, 308);put(1060, 312);
- put(1061, 316);put(1062, 320);put(1063, 324);put(1064, 328);put(1065, 332);put(1066, 336);put(1067, 340);
- put(1068, 344);put(1069, 348);put(1070, 352);put(1071, 356);put(1072, 360);put(1073, 364);put(1074, 368);
- put(1075, 372);put(1076, 376);put(1077, 380);put(1078, 384);put(1079, 388);
-
- put(1080, 164);put(1081, 168);put(1082, 172);put(1083, 176);put(1084, 180);put(1085, 184);put(1086, 188);
- put(1087, 192);put(1088, 196);put(1089, 200);put(1090, 204);put(1091, 208);put(1092, 212);put(1093, 216);
- put(1094, 220);put(1095, 224);put(1096, 228);put(1097, 232);put(1098, 236);put(1099, 240);put(1100, 244);
- put(1101, 248);put(1102, 252);put(1103, 256);put(1104, 260);put(1105, 264);
- put(1106, 268);put(1107, 272);put(1108, 276);put(1109, 280);put(1110, 284);
-
- put(2001, 0);put(2002, 4);put(2003, 8);put(2004, 12);put(2005, 16);
- put(2006, 20);put(2007, 24);put(2008, 28);put(2009, 32);put(2010, 36);
- put(2011, 40);put(2012, 44);put(2013, 48);put(2014, 52);put(2015, 56);
- put(2016, 60);put(2017, 64);put(2018, 68);put(2019, 72);put(2020, 76);
- put(2021, 80);put(2022, 84);put(2023, 88);put(2024, 92);put(2025, 96);
- put(2026, 100);put(2027, 104);put(2028, 108);put(2029, 112);put(2030, 116);
- put(2031, 120);put(2032, 124);put(2033, 128);put(2034, 132);put(2035, 136);
- put(2037, 144);
-
- put(4001, 240);put(4002, 244);put(4003, 248);put(4004, 252);put(4005, 256);
- put(4006, 260);
- // 鍏朵粬绔欑偣鍚岀悊缁х画鍔�
- }};
-
- public static final Map<Integer, Integer> siteErrOffsetMap = new HashMap<Integer, Integer>() {{
- put(1036, 512);put(1103, 476);put(1047, 452);put(2037, 270);put(4001,294);
-
- }};
-
- // 鐗规畩绔欑偣闆嗗悎
- private static final Set<Integer> specialSites = new HashSet<>(
- Arrays.asList(1001,1005,1008,1011,1015,1019,1022,1025,1029, 1032,1039,2004,2001,2007,2010,2016,2013,2019,2022,2025,2028,4001,4004));
-
- // 鐗规畩绔欑偣闆嗗悎
- private static final Set<Integer> specialSites2 = new HashSet<>(
- Arrays.asList(1051,1055,1057,1065,1067,1069,1077,1081,1083,1086,1089,1092,1095,1097,1100,2034));
-
- private static final Set<Integer> specialSites3 = new HashSet<>(//鏈烘鑷傜珯鐐�
- Arrays.asList(1098,1093,1087,1082,1074,1071,1061,1058));
-
-
- public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(0); add(1); add(2);
- }};
- public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
- add(3); add(4); add(5);
- }};
- public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(1103);add(1036);add(1047);add(2037);
- }};
-
- private Integer count=0;
-
- // 鍋忕Щ閲忚绠楁柟娉�
- public static int getOffsetBySiteId(int siteId) {
- int offset = 0;
- if (specialSites.contains(siteId)) {
- offset = 96; // 鐗规畩绔欑偣鍗� 96
- } else {
- offset = 72; // 鏅�氱珯鐐瑰崰 72
- }
- return offset;
- }
- // 鍋忕Щ閲忚绠楁柟娉�
- public static int getOffsetBySiteId2(int siteId) {
- int offset = 0;
- if (specialSites.contains(siteId)) {
- offset = 72; // 鐗规畩绔欑偣鍗� 72
- } else {
- offset = 60; // 鏅�氱珯鐐瑰崰 60
- }
- return offset;
- }
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 6;
+ private int barcodeSize = 3;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -227,14 +80,7 @@
* 4.鍑哄簱妯″紡
*/
public IoModeType ioModeOf2F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
- public IoModeType ioModeOf4F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
-
- public SiemensDevpThread(DevpSlave slave) {
- this.slave = slave;
- }
-
+ // public IoModeType ioMode = IoModeType.NONE;
private ArrayList<Integer> getStaNo() {
switch (slave.getId()) {
case 1:
@@ -245,51 +91,32 @@
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
}
-
- private ArrayList<Integer> getBarcodeList() {
+ private ArrayList<Integer> getStaNoW() {
switch (slave.getId()) {
case 1:
- return BarcodeList;
+ return staNos1W;
case 2:
- return BarcodeList2;
+ return staNos2W;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
}
- private boolean connectDev = false;
+
+ public SiemensDevpThread(DevpSlave slave) {
+ this.slave = slave;
+ }
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- connectDev = connect();
- while(!connectDev){
- try {
- connectDev = this.connect();
- Thread.sleep(100);
- } catch (Exception e){
-
- }
- }
-
+ initSite();
// 鍚姩绾跨▼鑷姩閲嶈繛
new Thread(this::devConnect).start();
new Thread(this::readStatusDev).start();
new Thread(this::writeStatusDev).start();
}
- private void readStatusDev() {
- while (true) {
- try {
- Thread.sleep(50);
- read();
- } catch (Exception e) {
- log.error("Dev鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- initSite();
- }
- }
-
- }
private void devConnect() {
while (true) {
try {
@@ -305,111 +132,43 @@
}
} catch (Exception e) {
log.info("dev杩炴帴澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+// log.error("rgv杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", slave.getId(), "rgv杩炴帴澶辫触"+e.getMessage());
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
initSite();
// e.printStackTrace();
}
}
}
- private void writeStatusDev() {
- while (true) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
-// read();
- break;
- // 鍐欐暟鎹� ID+鐩爣绔�
- case 2:
- write((StaProtocol)task.getData());
- log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
- break;
- default:
- break;
- }
- // 蹇冭烦
-// heartbeat();
- Thread.sleep(400);
- } catch (Exception e) {
-// e.printStackTrace();
- try{
- log.error("dev鍐欑嚎绋嬪紓甯�"+e.getMessage());
-
- } catch (Exception e1){
-
- }
- log.error("DEV鏁版嵁鍐欏叆绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-
- }
-
- }
-
- }
-// @Override
-// @SuppressWarnings("InfiniteLoopStatement")
-// public void run() {
-// connect();
-// while (true) {
-// try {
-// int step = 1;
-// Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
-// if (task != null) {
-// step = task.getStep();
-// }
-// switch (step) {
-// // 璇绘暟鎹�
-// case 1:
-// read();
-// break;
-// // 鍐欐暟鎹� ID+鐩爣绔�
-// case 2:
-// write((StaProtocol)task.getData());
-// log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
-// break;
-// default:
-// break;
-// }
-// // 蹇冭烦
-//// heartbeat();
-// Thread.sleep(100);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-//
-// }
-// }
/**
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
private void initSite() {
- count ++;
ArrayList<Integer> staNos = getStaNo();
- if(count > 77) {
- // 绔欑偣缂栧彿
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo(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);
- }
+ // 绔欑偣缂栧彿
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
}
- count = 0;
+ staProtocol.setWorkNo(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);
+ }
}
}
@@ -423,14 +182,103 @@
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()));
- News.info("SiemensDevp"+" - 1"+" - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.info("杈撻�佺嚎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()));
- News.error("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+
+ if (System.currentTimeMillis()-currentTimeMilliConnectDev>1000*60*10){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
+ if (currentTimeMilliConnectDev == 0){
+ currentTimeMilliConnectDev = System.currentTimeMillis()-1000*60*10-1;
+ } else {
+ currentTimeMilliConnectDev = System.currentTimeMillis();
+
+ }
+ }
+ initSite();
}
siemensS7Net.ConnectClose();
- initSite();
return result;
+ }
+
+
+
+ private void writeStatusDev() {
+ while (true) {
+ try {
+ if(!connectDev){
+ try {
+ Thread.sleep(1000L);
+ } catch (Exception e){
+
+ }
+ continue;
+ }
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+ if (task != null) {
+ step = task.getStep();
+ }
+ switch (step) {
+ // 璇绘暟鎹�
+ case 1:
+// read();
+ break;
+ // 鍐欐暟鎹� ID+鐩爣绔�
+ case 2:
+ write((StaProtocol)task.getData());
+ break;
+ default:
+ break;
+ }
+ // 蹇冭烦
+// heartbeat();
+ Thread.sleep(200);
+ } catch (Exception e) {
+// e.printStackTrace();
+ }
+
+ }
+ }
+ private void readStatusDev() {
+ while (true) {
+ try {
+ if(!connectDev){
+ try {
+ Thread.sleep(1000L);
+ } catch (Exception e){
+
+ }
+ initSite();
+ continue;
+ }
+ Thread.sleep(50);
+// System.out.println("璇荤嚎绋�"+ slave.getId());
+
+ read();
+
+ } catch (Exception e) {
+ connectDev = false;
+ log.error("dev鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", slave.getId(), "dev鏁版嵁璇诲彇绾跨▼寮傚父"+e.getMessage());
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
+ initSite();
+// e.printStackTrace();
+ }
+
+ }
+
}
/**
@@ -441,32 +289,8 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = null;
- OperateResultExOne<byte[]> result1 = null;
- OperateResultExOne<byte[]> result2 = null;//1029-1037
- OperateResultExOne<byte[]> result3 = null;//1042-1053
- OperateResultExOne<byte[]> result4 = null;//1054-1079
- OperateResultExOne<byte[]> result5 = null;//1080-1110
- OperateResultExOne<byte[]> resultErr = null;
- if(staNoSize == 102){
- result1 = siemensS7Net.Read("DB100.0", (short) (2768));//1001-1028
- result2 = siemensS7Net.Read("DB101.0", (short) (1268));//1029-1037
- result3 = siemensS7Net.Read("DB104.0", (short) (1268));//1042-1053
- result4 = siemensS7Net.Read("DB103.0", (short) (2824));//1054-1079
- result5 = siemensS7Net.Read("DB102.0", (short) (3428));//1080-1110
- resultErr = siemensS7Net.Read("DB3.0", (short) (536));
- }else{
- result1 = siemensS7Net.Read("DB200.0", (short) (3000));//2001-2030
- result2 = siemensS7Net.Read("DB201.0", (short) (720));//2031-2037
- result3 = siemensS7Net.Read("DB400.0", (short) (600));//4001-4006
- resultErr = siemensS7Net.Read("DB3.0", (short) (354));
-
- }
-
-
-
-
- if (result1.IsSuccess && result2.IsSuccess) {
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
+ if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
@@ -475,261 +299,123 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8)); // 宸ヤ綔鍙�
+
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4)); // 鐩爣绔�
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
+ staProtocol.setAutoing(status[0]); // 鑷姩
+// staProtocol.setAutoing(true); // 鑷姩
+ staProtocol.setLoading(status[1]); // 鏈夌墿
+// staProtocol.setLoading(true); // 鏈夌墿
+ staProtocol.setInEnable(status[2]); // 鍙叆
+// staProtocol.setInEnable(true); // 鍙叆
+ staProtocol.setOutEnable(status[3]);// 鍙嚭
+// staProtocol.setOutEnable(true);// 鍙嚭
+ staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
+
+
+
+ if (!staProtocol.isPakMkWalk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ staProtocol.setPakMkWalk(true);
+ }
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
+
+ if (!staProtocol.isPakMkRun() && !staProtocol.isLoading()) {
+ staProtocol.setPakMkRun(true);
+ }
+
+ if (!staProtocol.isPakMkTask() && !staProtocol.isLoading()) {
+ staProtocol.setPakMkTask(true);
+ }
+ }
+ }
+ ArrayList<Integer> staW = getStaNoW();
+
+ //鏉＄爜
+// Thread.sleep(50);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.212",(short) (barcodeSize*8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeSize; i++) {
+ Integer siteId = staW.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ station.put(siteId, staProtocol);
+ }
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1+3*slave.getId());
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ if (!Cools.isEmpty(barcode) && !barcode.equals("00000000")){
+ staProtocol.setBarcodeNow(barcode);
+ } else if (Cools.isEmpty(barcode)){
+ staProtocol.setBarcodeNow("-");
+ }
+ }
+
+ }
+ }
+
+ //鏉＄爜
+// Thread.sleep(50);
+
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.200",(short) (staW.size()*4));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < staW.size(); i++) {
+ Integer siteId = staW.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ station.put(siteId, staProtocol);
+ }
staProtocol.setSiteId(siteId);
- if (staNoSize == 102) {
- if (siteId < 1029) {
- result = result1;
- } else if (siteId < 1042) {
- result = result2;
- } else if (siteId < 1054) {
- result = result3;
- } else if (siteId < 1080) {
- result = result4;
- } else if (siteId < 1111) {
- result = result5;
- }
- }else{
- if (siteId < 2031) {
- result = result1;
- } else if (siteId < 4001) {
- result = result2;
- } else {
- result = result3;
- }
- }
-// if(siteId < 5){
-// int rgvNo = 2;
-// if(siteId<3){
-// rgvNo = 1;
-// }
-//// BasRgv basRgv = basRgvMapper.selectByRgvNo(rgvNo);
-// BasRgvMap basRgvMap = basRgvMapMapper.selectByRgvNo(rgvNo);
-// if(siteId%2 != 0){
-//// staProtocol.setWorkNo(basRgv.getWrkNo1());
-// }else{
-//// staProtocol.setWorkNo(basRgv.getWrkNo2());
-// }
-//
-// }else{
- // 鑾峰彇璇ョ珯鐐瑰搴旂殑鍋忕Щ閲�
- Integer offset = siteOffsetMap.get(siteId);
- if (offset == null) {
- continue; // 濡傛灉娌″畾涔夊亸绉婚噺锛岃烦杩�
- }
- Integer offset2 = getOffsetBySiteId(siteId);//鐗规畩鍋忕Щ閲忚绠�
- Integer offset3 = getOffsetBySiteId2(siteId);
- Integer offsetSign = siteOffsetMapSign.get(siteId);
- if(siteId == 1040){
- boolean[] full = siemensS7Net.getByteTransform().TransBool(result.Content, offset, 2);
- staProtocol.setFull(full[0]);
- }
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2)); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 12)); // 鐩爣绔�
- staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 16))); //鏉＄爜
-
- if(specialSites2.contains(siteId)){
- staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 48)); // 鐩爣绔�
- staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 52))); //鏉＄爜
- }
- if(staNosErrList.contains(siteId)){
- Integer offsetErr = siteErrOffsetMap.get(siteId);
- boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetErr, 2);
- staProtocol.setFrontErr(statusErr[2]);
- staProtocol.setBackErr(statusErr[3]);
- staProtocol.setHighErr(statusErr[5]);
- staProtocol.setLeftErr(statusErr[11]);
- staProtocol.setRightErr(statusErr[12]);
-// 鍙栧嚭454~458浣嶇疆鐨�5涓瓧鑺�
- byte[] bytes = Arrays.copyOfRange(resultErr.Content, (offsetErr + 14), (offsetErr + 19));
-// 杞崲鎴愬瓧绗︿覆锛圫7閲孋HAR鏄崟瀛楄妭缂栫爜锛岀洿鎺SCII鍗冲彲锛�
- String plcStr = new String(bytes, StandardCharsets.US_ASCII).trim();
-// 鍒ゆ柇鏄惁绛変簬 "error"
- staProtocol.setBarcodeErr("error".equalsIgnoreCase(plcStr));
- }
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 1);
- staProtocol.setAutoing(!status[0]); // 鑷姩
- boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
- boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 8, 3);
- boolean[] statusSign = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetSign, 3);
- boolean loading = false;
- if(!status1[0])
- {
- loading = true;
- }
- staProtocol.setLoading(loading); // 鏈夌墿
-
- staProtocol.setInEnable(status1[2]); // 鍙叆
- staProtocol.setOutEnable(status1[2]);// 鍙嚭
- staProtocol.setErr(status1[6]);
-
- //鎶ヨ
- staProtocol.setPassTimeOut(statusErr[0]);
- staProtocol.setObjectNoIdError(statusErr[1]);
- staProtocol.setIdNoObjectError(statusErr[2]);
- staProtocol.setLmfrError(statusErr[3]);
- staProtocol.setLiftError(statusErr[4]);
- staProtocol.setDlfrError(statusErr[5]);
- staProtocol.setDmfrError(statusErr[6]);
- staProtocol.setVfdError(statusErr[7]);
- staProtocol.setSrvError(statusErr[8]);
- staProtocol.setRes1(statusErr[9]);
- staProtocol.setRes2(statusErr[10]);
- staProtocol.setRes3(statusErr[11]);
- staProtocol.setCommunicationTimeOut(statusErr[12]);
- staProtocol.setParameterIncompleteError(statusErr[13]);
- staProtocol.setDataNotClear(statusErr[14]);
- staProtocol.setSetParameterError(statusErr[15]);
- staProtocol.setRes4(statusErr[16]);
- staProtocol.setRes5(statusErr[17]);
- staProtocol.setDataError(statusErr[18]);
-
- //淇″彿
- staProtocol.setSensorGArrive(statusSign[0]);
- staProtocol.setSensorGDec(statusSign[1]);
- staProtocol.setSensorGArrive2(statusSign[2]);
- staProtocol.setSensorLimit(statusSign[3]);
- staProtocol.setEmergency(statusSign[4]);
- staProtocol.setSensorGLeave(statusSign[5]);
- staProtocol.setSensorGLeave2(statusSign[6]);
- staProtocol.setSensorCUp(statusSign[7]);
- staProtocol.setSensorCDown(statusSign[8]);
- staProtocol.setLiftMotorFr(statusSign[9]);
- staProtocol.setLineMotorFr(statusSign[10]);
- staProtocol.setTranMotorFr(statusSign[11]);
- staProtocol.setRst1(statusSign[12]);
- staProtocol.setRst2(statusSign[13]);
- staProtocol.setRst3(statusSign[14]);
- staProtocol.setRst4(statusSign[15]);
- staProtocol.setSensorArriveD(statusSign[16]);
- staProtocol.setSensorDecD(statusSign[17]);
- staProtocol.setSensorArriveL(statusSign[18]);
- staProtocol.setSensorDecL(statusSign[19]);
- staProtocol.setSensorArriveR(statusSign[20]);
- staProtocol.setSensorDecR(statusSign[21]);
-
-
- if( (staProtocol.getPassTimeOut() ||
- staProtocol.getObjectNoIdError() ||
- staProtocol.getIdNoObjectError() ||
- staProtocol.getLmfrError() ||
- staProtocol.getLiftError() ||
- staProtocol.getDlfrError() ||
- staProtocol.getDmfrError() ||
- staProtocol.getVfdError() ||
- staProtocol.getSrvError() ||
- staProtocol.getRes1() ||
- staProtocol.getRes2() ||
- staProtocol.getRes3() ||
- staProtocol.getCommunicationTimeOut() ||
- staProtocol.getParameterIncompleteError() ||
- staProtocol.getDataNotClear() ||
- staProtocol.getSetParameterError() ||
- staProtocol.getDataError()) && staProtocol.isWriteMk()
- ){
- staProtocol.setErrorMk(true);//鑻ュ瓨鍦ㄥ紓甯歌Е鍙戝啓鍏�
- }
-
- if( !staProtocol.getPassTimeOut() &&
- !staProtocol.getObjectNoIdError() &&
- !staProtocol.getIdNoObjectError() &&
- !staProtocol.getLmfrError() &&
- !staProtocol.getLiftError() &&
- !staProtocol.getDlfrError() &&
- !staProtocol.getDmfrError() &&
- !staProtocol.getVfdError() &&
- !staProtocol.getSrvError() &&
- !staProtocol.getRes1() &&
- !staProtocol.getRes2() &&
- !staProtocol.getRes3() &&
- !staProtocol.getCommunicationTimeOut() &&
- !staProtocol.getParameterIncompleteError() &&
- !staProtocol.getDataNotClear() &&
- !staProtocol.getSetParameterError() &&
- !staProtocol.getDataError()
- ){
- staProtocol.setWriteMk(true);//鏃犲紓甯稿悗鎵嶈兘缁х画鍐欏叆
- staProtocol.setErrorMk(false);//鑻ュ瓨鍦ㄥ紓甯歌Е鍙戝啓鍏�
-
- }
-
-
- if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || staProtocol.getWorkNo()==0)) {
- staProtocol.setPakMk(true);
- }
-// }
-
- }
- }
- //鏉＄爜鎵弿鍣�
-
- ArrayList<Integer> barcodeList = getBarcodeList();
- OperateResultExOne<byte[]> reasultBarcode1 = siemensS7Net.Read("DB101.780", (short) 4);//1036
- OperateResultExOne<byte[]> reasultBarcode2 = siemensS7Net.Read("DB104.548", (short) 4);//1047
- OperateResultExOne<byte[]> reasultBarcode3 = siemensS7Net.Read("DB102.2780", (short) 4);//1103
- OperateResultExOne<byte[]> reasultBarcode4 = siemensS7Net.Read("DB201.344", (short) 4);//2037
- OperateResultExOne<byte[]> reasultBarcode5 = siemensS7Net.Read("DB400.112", (short) 4);//4001
- OperateResultExOne<byte[]> reasultBarcode6 = siemensS7Net.Read("DB201.716", (short) 4);//4001
-
- if(barcodeList.get(0) == 0){
- if(reasultBarcode1.IsSuccess){
- Integer barcodeId = barcodeList.get(0);
- String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode1.Content, 0));
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
-
- }
- if(reasultBarcode2.IsSuccess){
- Integer barcodeId = barcodeList.get(1);
- String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode2.Content, 0));
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
-
- }
- if(reasultBarcode3.IsSuccess){
- Integer barcodeId = barcodeList.get(2);
- String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode3.Content, 0));
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
-
- }
- }else if(barcodeList.get(0) == 3){
- if(reasultBarcode4.IsSuccess){
- Integer barcodeId = barcodeList.get(0);
- String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode4.Content, 0));
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + +1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
- }
- if(reasultBarcode5.IsSuccess){
- Integer barcodeId = barcodeList.get(1);
- String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode5.Content, 0));
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + +1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
- }
- if(reasultBarcode6.IsSuccess){
- Integer barcodeId = barcodeList.get(2);
- String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode6.Content, 0));
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + +1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- }
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4 + 2, 2);
+ staProtocol.setFrontErr(status[0]); // 鍓嶈秴闄�
+ staProtocol.setBackErr(status[1]); // 鍚庤秴闄�
+ staProtocol.setHighErr(status[2]); // 楂樿秴闄�
+ staProtocol.setLeftErr(status[3]); // 宸﹁秴闄�
+ staProtocol.setRightErr(status[4]); // 鍙宠秴闄�
+ staProtocol.setWeightErr(status[5]); // 瓒呴噸
+ staProtocol.setBarcodeErr(status[6]); // 鎵爜澶辫触
}
}
+ try{
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0",(short) (staNoSize*4));
+ if (resultErr.IsSuccess){
+ for (int i = 0; i < staNoSize; 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.setSiteId(siteId);
+ boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
+ staProtocol.setErrOther1(statusErr[0]); // 鐢佃矾淇濇姢鍣ㄦ柇寮�
+ staProtocol.setErrOther2(statusErr[1]); // 鍏夌數寮傚父
+ staProtocol.setErrOther3(statusErr[2]); // 杩愯瓒呮椂
+ staProtocol.setErrOther4(statusErr[3]); // 鍗犱綅瓒呮椂
+ staProtocol.setErrOther5(statusErr[4]); // 鏈変换鍔℃棤璐ф晠闅�
+ staProtocol.setErrOther6(statusErr[5]); // 鍙橀鍣ㄦ晠闅�
+ staProtocol.setErrOther7(statusErr[6]); // 鎺ヨЕ鍣ㄦ晠闅�
+ staProtocol.setErrOther8(statusErr[7]); // 椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ }
+ }
+ } catch (Exception e){
+ }
-
- if (result1.IsSuccess && result2.IsSuccess) {
+ if (result.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -739,37 +425,33 @@
for (Integer siteId : staNos) {
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
- if(staProtocol.isWriteMk() && staProtocol.isErrorMk()){
- try {
- // 鏃ュ織璁板綍寮傚父鎯呭喌
- BasDevpErrorLog basDevpErrorLogs;
- basDevpErrorLogs = staProtocol.toSqlModelError();
- BasDevpErrorLogService basDevpErrorLogService = SpringUtils.getBean(BasDevpErrorLogService.class);
- basDevpErrorLogService.insert(basDevpErrorLogs);
- staProtocol.setWriteMk(false);
- } catch (Exception ignore) {
- log.error(ignore.getMessage());
- }
+ }
+ try{
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
-
+ } catch (Exception e){
+// log.error("e:"+e.getMessage());
}
- BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-
- if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
- }
-
} catch (Exception e) {
- initSite();
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()));
- News.error("SiemensDevp"+" - 3"+" - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", 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());
}
+// try{
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.deleteDeviceError("devp", slave.getId());
+// } catch (Exception e){
+//// log.error("e:"+e.getMessage());
+// }
} 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:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", slave.getId(), "璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐�");
}
}
@@ -781,119 +463,110 @@
return;
}
ArrayList<Integer> staNos = getStaNo();
+
int index = staNos.indexOf(staProtocol.getSiteId());
- Integer siteId = staProtocol.getSiteId();
- // 鑾峰彇璇ョ珯鐐瑰搴旂殑鍋忕Щ閲�
- Integer offset = siteOffsetMap.get(siteId);
- Integer offset2 = getOffsetBySiteId(siteId);
- Integer offset3 = getOffsetBySiteId2(siteId);
- OperateResult write = null;
- OperateResult write1 = null;
+
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devWrite", staProtocol.getSiteId(), "鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
+
+ OperateResult writeResult;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
- do {
+ //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
+ boolean writeFlag = false;
+ while(writeCount < 5){
+ OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ if(writeResult1.IsSuccess && writeResult2.IsSuccess){
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.0" + index*6, (short)4);
- if(siteId < 1029){
- write = siemensS7Net.Write("DB100." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else if(siteId < 1042){
- write = siemensS7Net.Write("DB101." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- write1 = siemensS7Net.Write("DB101." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else if(siteId < 1054){
- write = siemensS7Net.Write("DB104." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- if(specialSites2.contains(siteId)){
- write1 = siemensS7Net.Write("DB104." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else{
- write1 = siemensS7Net.Write("DB104." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ if(readResult.IsSuccess){
+ Integer workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+// short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
+ if(staProtocol.getWorkNo().equals(workNo)){
+ //浠诲姟鍛戒护鍐欏叆鎴愬姛
+ writeFlag = true;
+ log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ break;
+ } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
+ writeCount++;
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
+ slave.getId(), JSON.toJSON(staProtocol),writeCount));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆鍚庤鍙栦换鍔″�间笉涓�鑷�:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
+ }
+ } else {
+ writeCount++;
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
+ slave.getId(), JSON.toJSON(staProtocol), writeCount));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐�:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
}
- }else if(siteId < 1080){
- write = siemensS7Net.Write("DB103." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- if(specialSites2.contains(siteId)){
- write1 = siemensS7Net.Write("DB103." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else{
- write1 = siemensS7Net.Write("DB103." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }
- }else if(siteId < 1111){
- write = siemensS7Net.Write("DB102." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- if(specialSites2.contains(siteId)){
- write1 = siemensS7Net.Write("DB102." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else{
- write1 = siemensS7Net.Write("DB102." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }
- }else if(siteId < 2031){
- write = siemensS7Net.Write("DB200." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- if(specialSites2.contains(siteId)){
- write1 = siemensS7Net.Write("DB200." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else{
- write1 = siemensS7Net.Write("DB200." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }
- }else if(siteId < 4000){
- write = siemensS7Net.Write("DB201." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- if(specialSites2.contains(siteId)){
- write1 = siemensS7Net.Write("DB201." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else{
- write1 = siemensS7Net.Write("DB201." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }
- }else{
- write = siemensS7Net.Write("DB400." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- if(specialSites2.contains(siteId)){
- write1 = siemensS7Net.Write("DB400." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }else{
- write1 = siemensS7Net.Write("DB400." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
- }
- }
- if(write.IsSuccess && write1.IsSuccess){
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- break;
- }
- else {
+ } else {
writeCount++;
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
+ slave.getId(), JSON.toJSON(staProtocol),writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆杈撻�佺嚎鍛戒护澶辫触:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
+ //鏇存柊鎸囦护鏃ュ織
+// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
+// commandInfoLogService.insert(commandInfoLog);
}
- }while (writeCount<5);
- try {
- // 鏃ュ織璁板綍
- BasDevpOptService bean = SpringUtils.getBean(BasDevpOptService.class);
- BasDevpOpt basDevpOpt = new BasDevpOpt(
- staProtocol.getWorkNo(),
- new Date(),
- staProtocol.getSiteId(),
- (int)staProtocol.getStaNo(),
- new Date(),
- String.valueOf(staProtocol.isLoading()),
- staProtocol.getBarcode(),
- staProtocol.isFrontErr()? 1L:0L,
- staProtocol.isBackErr()? 1L:0L,
- staProtocol.isHighErr()? 1L:0L,
- staProtocol.isLeftErr()? 1L:0L,
- staProtocol.isRightErr()? 1L:0L,
- staProtocol.isBarcodeErr()? 1L:0L
-
- );
- bean.insert(basDevpOpt);
- } catch (Exception ignore) {
- log.error(ignore.getMessage());
+ Thread.sleep(200);
}
- if (!write.IsSuccess) {
+ //鍐欏懡浠ゅ皾璇曚簡5娆¤繕鏄け璐ヤ簡
+ if(!writeFlag){
staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0 && !staProtocol.isLoading()) {
+ if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
staProtocol.setPakMk(true);
}
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- News.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devErr", staProtocol.getSiteId(), "鍐欏叆娆℃暟"+writeCount+"鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐�:"+"鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
+ }
+ //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
+ boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+ read();//璇诲彇1娆¤澶囩姸鎬�
+ return;
} else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ 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));
+
+ Integer siteId = staProtocol.getSiteId();
+ staProtocol = station.get(siteId);
+ if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
+ staProtocol.setPakMk(true);
+ }
+
+ //鏇存柊浠诲姟姝ュ簭
+ TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(staProtocol.getWorkNo());
+ if (taskWrk != null) {
+ taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+ taskWrkService.updateById(taskWrk);
+ }
}
+
}
// 鏇存柊鍏ュ嚭搴撴ā寮�
@@ -901,36 +574,9 @@
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());
+ log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
- }
- public Integer getRgvPosI(Integer pos) {
- if (pos == null) return 0;
-
- // key: 绔欑偣鍙� value: 鍩哄噯鐗╃悊浣嶇疆
- Map<Integer, Integer> posMap = new HashMap<>();
- posMap.put(1004, 6534);
- posMap.put(1007, 33634);
- posMap.put(1010, 75174);
- posMap.put(1014, 102124);
- posMap.put(1018, 138224);
- posMap.put(1021, 178034);
- posMap.put(1024, 219684);
- posMap.put(1028, 246724);
- posMap.put(1031, 288194);
- posMap.put(1035, 315204);
- int tolerance = 50; // 鍏佽璇樊鑼冨洿
-
- for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) {
- int site = entry.getKey();
- int basePos = entry.getValue();
- if (Math.abs(pos - basePos) <= tolerance) {
- return site;
- }
- }
-
- return 0; // 娌″尮閰嶅埌绔欑偣
}
/**
@@ -944,7 +590,7 @@
}
OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
if (!write.IsSuccess) {
- News.error("SiemensDevp"+" - 7"+" - 杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+ log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
}
}
@@ -952,10 +598,67 @@
* 璁剧疆鍏ュ簱鏍囪
*/
@Override
- public void setPakMk(Integer siteId, boolean pakMk) {
+ public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
StaProtocol staProtocol = station.get(siteId);
if (null != staProtocol) {
+ log.info("閿佸畾鍏ュ簱鏍囪锛岀珯鐐瑰彿={};pakMk={};鏃堕棿={};鏍囪={}",siteId,pakMk,new Date(),i);
staProtocol.setPakMk(pakMk);
+ }
+ }
+
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setPakMkTask(Integer siteId, boolean pakMk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setPakMkTask(pakMk);
+ }
+ }
+
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setPakMkRun(Integer siteId, boolean pakMk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setPakMkRun(pakMk);
+ }
+ }
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setPakMkWalk(Integer siteId, boolean pakMkWalk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setPakMkWalk(pakMkWalk);
+ }
+ }
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setGrossWt(Integer siteId, Double grossWt) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setGrossWt(grossWt);
+ }
+ }
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
+ public void setErrorDev(Integer siteId, String msgErr) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setErrorDev(msgErr);
}
}
@@ -965,37 +668,22 @@
}
public static void main(String[] args) {
- System.out.println(staNos1.indexOf(129));
- System.out.println(staNos1.size());
- for (int i = 0; i<staNos1.size(); i++) {
-// System.out.println(i*2);
-// System.out.println(i*2 + 200);
-// System.out.println(i);
+ ArrayList<Integer> staNos = staNos1;
+ System.out.println(staNos.indexOf(129));
+ System.out.println(staNos.size());
+ for (int i = 0; i<staNos.size(); i++) {
}
- int index = staNos1.indexOf(128);
+ 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");
-// SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-// devpThread.connect();
-// devpThread.read();
-// // 鍐�
-// StaProtocol staProtocol = devpThread.getStation().get(1);
-// staProtocol.setWorkNo((short) 232);
-// staProtocol.setStaNo((short) 6);
-// staProtocol.setAutoing(true);
-// staProtocol.setEmptyMk(true);
-// staProtocol.setInEnable(true);
-// devpThread.write(staProtocol);
-// System.out.println("----------------------------------------");
-// // 璇�
-// devpThread.read();
-// System.out.println(JSON.toJSONString(devpThread.station));
-//
-// }
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
}
--
Gitblit v1.9.1