From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 402 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 331 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 56f40a1..d56487d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,11 +50,14 @@
add(1008);add(1009);add(1010);add(1011);add(1012);add(1013);add(1014);add(1015);
add(1016);add(1017);add(1018);add(1019);add(1020);add(1021);add(1022);add(1023);
}};
+ private boolean connectDev = false;
+ public Long currentTimeMilliConnectDev= 0L;
+
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 2;
+ private int barcodeSize = 3;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -82,36 +85,59 @@
@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());
- break;
- default:
- break;
- }
- // 蹇冭烦
-// heartbeat();
- Thread.sleep(400);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ initSite();
+ try{
+ Thread.sleep(2000);
+ } catch (Exception e){
}
+ connectDev = connect();
+ while(!connectDev){
+ try {
+ connectDev = this.connect();
+ Thread.sleep(100);
+ } catch (Exception e){
+
+ }
+ }
+
+ // 鍚姩绾跨▼鑷姩閲嶈繛
+ new Thread(this::devConnect).start();
+ new Thread(this::readStatusDev).start();
+ new Thread(this::writeStatusDev).start();
+
+
}
+
+ private void devConnect() {
+ while (true) {
+ try {
+ Thread.sleep(1000);
+
+ if(!connectDev){
+ try {
+ connectDev = this.connect();
+ Thread.sleep(100);
+ } catch (Exception e){
+
+ }
+ }
+ } 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();
+ }
+ }
+ }
/**
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
@@ -153,12 +179,99 @@
} 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杩炴帴澶辫触");
+
+
+ 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();
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();
+ }
+
+ }
+
}
/**
@@ -196,6 +309,7 @@
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
+ staProtocol.setStaOk(status[8]); // 灏辩华
@@ -207,20 +321,92 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
+
+ if (!staProtocol.isPakMkRun() && !staProtocol.isLoading()) {
+ staProtocol.setPakMkRun(true);
+ }
+
+ if (!staProtocol.isPakMkTask() && !staProtocol.isLoading()) {
+ staProtocol.setPakMkTask(true);
+ }
+ }
+ }
+ int[] staW = new int[]{1004,1014,1020};
+
+ //鏉＄爜
+// Thread.sleep(50);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeSize; i++) {
+ Integer siteId = staW[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,6, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ if (!Cools.isEmpty(barcode) && !barcode.equals("000000")){
+ staProtocol.setBarcodeNow(barcode);
+ } else if (Cools.isEmpty(barcode)){
+ staProtocol.setBarcodeNow("-");
+ }
+ }
+
}
}
//鏉＄爜
- Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.100.0",(short) (barcodeSize*8));
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
+// Thread.sleep(50);
+
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < staW.length; i++) {
+ Integer siteId = staW[i]; // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setSiteId(siteId);
+ 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 (result.IsSuccess) {
@@ -234,24 +420,32 @@
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
}
-
- BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ try{
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ }
+ } catch (Exception e){
+// log.error("e:"+e.getMessage());
}
+
} catch (Exception e) {
e.printStackTrace();
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.deleteDeviceError("devp", slave.getId());
+// 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("devp", slave.getId(), "璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐�");
+ deviceErrorService.addDeviceError("devErr", slave.getId(), "璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐�");
}
}
@@ -266,26 +460,32 @@
int index = staNos.indexOf(staProtocol.getSiteId());
- //鏇存柊鍛戒护鏃ュ織
- CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
- CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
- CommandInfoLog commandInfoLog = new CommandInfoLog();
- if (commandInfo != null) {
- commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
- commandInfoLog.setId(null);
- }else {
- Date now = new Date();
- commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
- commandInfoLog.setCommandStatus(3);
- commandInfoLog.setStartTime(now);
- commandInfoLog.setExecuteTime(now);
- commandInfoLog.setCompleteTime(now);
- commandInfoLog.setDevice(SlaveType.Devp.toString());
- commandInfoLog.setWrkNo(9999);
- commandInfoLog.setTaskNo("9999");
- commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devWrite", staProtocol.getSiteId(), "鍗曠珯鐐瑰啓鍏ワ細浠诲姟鍙�:"+staProtocol.getWorkNo()+";鐩爣绔�:"+staProtocol.getStaNo());
+ } catch (Exception e2){
}
+
+// //鏇存柊鍛戒护鏃ュ織
+// CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
+// CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+// CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
+// CommandInfoLog commandInfoLog = new CommandInfoLog();
+// if (commandInfo != null) {
+// commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+// commandInfoLog.setId(null);
+// }else {
+// Date now = new Date();
+// commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
+// commandInfoLog.setCommandStatus(3);
+// commandInfoLog.setStartTime(now);
+// commandInfoLog.setExecuteTime(now);
+// commandInfoLog.setCompleteTime(now);
+// commandInfoLog.setDevice(SlaveType.Devp.toString());
+// commandInfoLog.setWrkNo(9999);
+// commandInfoLog.setTaskNo("9999");
+// commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+// }
OperateResult writeResult;
//浠诲姟涓嬪彂娆℃暟
@@ -293,15 +493,15 @@
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
while(writeCount < 5){
- OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult writeResult1 = siemensS7Net.Write("DB101." + index*8, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ OperateResult writeResult2 = siemensS7Net.Write("DB101." + (index*8+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
if(writeResult1.IsSuccess && writeResult2.IsSuccess){
Thread.sleep(200);
OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB101.0" + index*8, (short)4);
//鏇存柊鎸囦护鏃ュ織
- commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
- commandInfoLogService.insert(commandInfoLog);
+// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+// commandInfoLogService.insert(commandInfoLog);
if(readResult.IsSuccess){
Integer workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
@@ -316,22 +516,36 @@
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 {
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);
+// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
+// commandInfoLogService.insert(commandInfoLog);
}
Thread.sleep(200);
}
@@ -344,7 +558,11 @@
}
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娆¤澶囩姸鎬�
@@ -406,6 +624,29 @@
}
}
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @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);
+ }
+ }
/**
* 璁剧疆鍏ュ簱鏍囪
*/
@@ -425,6 +666,17 @@
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);
}
}
@@ -468,4 +720,12 @@
//
// }
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
--
Gitblit v1.9.1