From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 330 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 216 insertions(+), 114 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 931fedf..e41a8fa 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,7 +9,6 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.CommandInfoLog;
@@ -29,10 +28,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;
/**
@@ -47,6 +43,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ private Integer rgvCount = 4;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);add(111);
add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);add(120);add(121);add(122);add(123);
@@ -69,6 +66,12 @@
public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
add(400);add(401);add(402);add(403);
add(404);add(405);add(406);add(407);
+ }};
+ public static final ArrayList<Integer> hoist1 = new ArrayList<Integer>() {{
+ add(302);add(303);
+ }};
+ public static final ArrayList<Integer> hoist2 = new ArrayList<Integer>() {{
+ add(402);add(403);
}};
/**
@@ -101,6 +104,17 @@
}
}
+ private ArrayList<Integer> getHoist() {
+ switch (slave.getId()) {
+ case 3:
+ return hoist1;
+ case 4:
+ return hoist2;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
+
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
}
@@ -124,9 +138,15 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
+ read();
break;
case 3:
write2((StaProtocol)task.getData());
+ read();
+ break;
+ case 4:
+ write3((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -137,6 +157,38 @@
e.printStackTrace();
}
+ }
+ }
+
+ // 鍐欑粍鎷撲俊鍙�(娌℃湁鏌ヨ鍒拌鎵樼洏鐮佷换鍔�)
+ private void write3(StaProtocol staProtocol) {
+ // 涓�涓猻hort=涓や釜瀛楄妭=2*byte 1byte = 8浣�
+ // 鍏堣涓�娆�
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.200", (short) 1);
+ if(read.IsSuccess){
+ byte[] content = read.Content;
+ boolean[] array = siemensS7Net.getByteTransform().TransBool(content, 0,1);
+ // 濡傛灉宸茬粡涓簍rue锛屽垯涓嶉噸澶嶅啓
+ boolean flag = false;
+ switch (staProtocol.getSiteId()) {
+ case 103: if(array[0]) {
+ } else array[0] = true; flag = true; break;
+ case 107: if(array[1]) {
+ } else array[1] = true; flag = true; break;
+ case 111: if(array[2]) {
+ } else array[2] = true; flag = true; break;
+ case 115: if(array[3]) {
+ } else array[3] = true; flag = true; break;
+ case 119: if(array[4]) {
+ } else array[4] = true; flag = true; break;
+ case 123: if(array[5]) {
+ } else array[5] = true; flag = true; break;
+ default:
+ }
+ if (flag) {
+ siemensS7Net.Write("DB100.200", array);
+ log.info("鍐欏叆缁勬墭淇″彿锛歿}", Arrays.toString(array));
+ }
}
}
@@ -163,6 +215,20 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
+ }
+ }
+ if (slave.getId() == 2){
+ for (int i = 1;i<5;i++){
+ StaProtocol staProtocol = station.get(i);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i);
+ station.put(i, staProtocol);
+ }
+ staProtocol.setWorkNo((short) 0);
+ staProtocol.setNearbySta((short) 1);
+ staProtocol.setLoading(false);
+ staProtocol.setAutoing(false);
}
}
}
@@ -213,7 +279,7 @@
}
}
- Thread.sleep(200);
+ //Thread.sleep(200);
OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
@@ -235,10 +301,63 @@
}
}
+ if (slave.getId() == 2){
+
+ OperateResultExOne<byte[]> resultRgvWrkNo = siemensS7Net.Read("DB55.222", (short) 98);
+ OperateResultExOne<byte[]> resultRgvLocation = siemensS7Net.Read("DB43.0", (short) 8);
+ OperateResultExOne<byte[]> resultRgvload = siemensS7Net.Read("DB192.0", (short) 8);
+ if (resultRgvWrkNo.IsSuccess && resultRgvLocation.IsSuccess && resultRgvload.IsSuccess){
+ for (int i = 0;i<4;i++){
+ short wrkNo = siemensS7Net.getByteTransform().TransInt16(resultRgvWrkNo.Content, i * 32);
+ short location = siemensS7Net.getByteTransform().TransInt16(resultRgvLocation.Content, i * 2);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgvload.Content, i*2, 1);
+ StaProtocol staProtocol = station.get((i+1));
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId((i+1));
+ station.put((i+1), staProtocol);
+ }
+ staProtocol.setWorkNo(wrkNo);
+ staProtocol.setAutoing(true);
+ staProtocol.setNearbySta(location);
+ staProtocol.setLoading(status[0]);
+ }
+ }
+ }
+ if (slave.getId() == 3 || slave.getId() == 4){
+ ArrayList<Integer> hoist = getHoist();
+ int hoistSize = hoist.size();
+ OperateResultExOne<byte[]> resultHoist = siemensS7Net.Read("DB15.0", (short) 33);
+ if (resultHoist.IsSuccess) {
+ Integer siteId = hoist.get(0); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultHoist.Content, 32, 1);
+ staProtocol.setPlace1(status[0]);
+ staProtocol.setPlace2(status[1]);
+
+ Integer siteId2 = hoist.get(1); // 绔欑偣缂栧彿
+ staProtocol = station.get(siteId2);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ boolean[] status2 = siemensS7Net.getByteTransform().TransBool(resultHoist.Content, 32, 1);
+ staProtocol.setPlace1(status2[2]);
+ staProtocol.setPlace2(status2[3]);
+
+ }
+ }
+
if (slave.getId() == 1){
//鏉＄爜
- Thread.sleep(200);
+ //Thread.sleep(200);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.102",(short)60);
if (result2.IsSuccess) {
for (int i = 0; i < 6; i++) {
@@ -251,7 +370,7 @@
}
// 澶栧舰妫�娴� - 102
- Thread.sleep(100);
+ //Thread.sleep(100);
OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.160", (short)1);
if (result4.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
@@ -265,7 +384,7 @@
staProtocol.setBarcodeErr(status[6]);
}
// 澶栧舰妫�娴� - 107
- Thread.sleep(50);
+ //Thread.sleep(50);
OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.164", (short)1);
if (result5.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
@@ -279,7 +398,7 @@
staProtocol.setBarcodeErr(status[6]);
}
// 澶栧舰妫�娴� - 111
- Thread.sleep(50);
+ //Thread.sleep(50);
OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB101.168", (short)1);
if (result6.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result6.Content, 0, 1);
@@ -293,7 +412,7 @@
staProtocol.setBarcodeErr(status[6]);
}
// 澶栧舰妫�娴� - 115
- Thread.sleep(50);
+ //Thread.sleep(50);
OperateResultExOne<byte[]> result7 = siemensS7Net.Read("DB101.172", (short)1);
if (result7.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result7.Content, 0, 1);
@@ -307,7 +426,7 @@
staProtocol.setBarcodeErr(status[6]);
}
// 澶栧舰妫�娴� - 119
- Thread.sleep(50);
+ //Thread.sleep(50);
OperateResultExOne<byte[]> result8 = siemensS7Net.Read("DB101.176", (short)1);
if (result8.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result8.Content, 0, 1);
@@ -321,7 +440,7 @@
staProtocol.setBarcodeErr(status[6]);
}
// 澶栧舰妫�娴� - 123
- Thread.sleep(50);
+ //Thread.sleep(50);
OperateResultExOne<byte[]> result9 = siemensS7Net.Read("DB101.180", (short)1);
if (result9.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result9.Content, 0, 1);
@@ -335,8 +454,16 @@
staProtocol.setBarcodeErr(status[6]);
}
} else if (slave.getId() == 3) {
- // 澶栧舰妫�娴� - 111
- Thread.sleep(50);
+ //鏉＄爜
+ //Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
+ if (result2.IsSuccess) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 7);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
if (result10.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
@@ -348,28 +475,73 @@
staProtocol.setRightErr(status[4]);
staProtocol.setWeightErr(status[5]);
staProtocol.setBarcodeErr(status[6]);
+ }
+ } else if (slave.getId() == 4) {
+ //鏉＄爜
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
+ if (result2.IsSuccess) {
+
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 8);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+ // 澶栧舰妫�娴� - 111
+ //Thread.sleep(50);
+ OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
+ if (result10.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
+ StaProtocol staProtocol = station.get(401);
+ 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]);
}
}
+ if(slave.getId() != 2){
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
+ if (resultErr.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
+ StaProtocol staProtocol = station.get(siteId);
+ 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[]> resultErr = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
- if (resultErr.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
- StaProtocol staProtocol = station.get(siteId);
- 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]);
+ }
+ }
+ }else {
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB1003.2", (short) (staNoSize*4));
+ if (resultErr.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
+ StaProtocol staProtocol = station.get(siteId);
+ 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]);
+ }
}
}
+
@@ -422,6 +594,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.deleteDeviceError("devp", slave.getId());
} else {
+ initSite();
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);
@@ -484,7 +657,7 @@
if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
//浠诲姟鍛戒护鍐欏叆鎴愬姛
writeFlag = true;
- log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ log.info("222鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
Date now = new Date();
@@ -514,7 +687,7 @@
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);
+ log.error("222鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
//鏇存柊鎸囦护鏃ュ織
commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
commandInfoLogService.insert(commandInfoLog);
@@ -523,7 +696,7 @@
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);
+ log.error("222鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
//鏇存柊鎸囦护鏃ュ織
commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
@@ -533,7 +706,7 @@
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);
+ log.error("222鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
//鏇存柊鎸囦护鏃ュ織
commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
@@ -549,28 +722,19 @@
staProtocol.setPakMk(true);
}
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ log.error("222鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
- 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)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", 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.selectByWrkNo(staProtocol.getWorkNo().intValue());
- if (taskWrk != null) {
- taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
- taskWrkService.updateById(taskWrk);
}
}
@@ -585,30 +749,6 @@
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
array[1] = staProtocol.getStaNo();
-// OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
-
- //鏇存柊鍛戒护鏃ュ織
-// CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
-// CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
-// CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
-// CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
-// commandInfoLog.setId(null);
-// 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;
//浠诲姟涓嬪彂娆℃暟
@@ -627,60 +767,29 @@
if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
//浠诲姟鍛戒护鍐欏叆鎴愬姛
writeFlag = true;
- log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
- Date now = new Date();
-
-// //鏇存柊鎸囦护鐘舵��
-// commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//杈撻�佺嚎鐩存帴瀹屾垚鐘舵��
-// commandInfo.setExecuteTime(now);
-// commandInfo.setCompleteTime(now);
-// commandInfoService.updateById(commandInfo);
-//
-// //鏇存柊鎸囦护鏃ュ織
-// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
-// commandInfoLog.setCommandStatus(CommandStatusType.COMPLETE.id);//杈撻�佺嚎鐩存帴瀹屾垚鐘舵��
-// commandInfoLog.setExecuteTime(now);
-// commandInfoLog.setCompleteTime(now);
-// commandInfoLogService.insert(commandInfoLog);
-
- //鏇存柊浠诲姟姝ュ簭
- TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
- if (taskWrk != null) {
- taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
- taskWrkService.updateById(taskWrk);
- }
+ log.info("3333鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎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);
-// //鏇存柊鎸囦护鏃ュ織
-// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
-// commandInfoLogService.insert(commandInfoLog);
+ log.error("333鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
}
} 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);
+ log.error("333鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-// //鏇存柊鎸囦护鏃ュ織
-// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
-// commandInfoLogService.insert(commandInfoLog);
}
} 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);
+ log.error("333鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-// //鏇存柊鎸囦护鏃ュ織
-// commandInfoLog.setDeviceLog("鎸囦护涓嬪彂澶辫触");
-// commandInfoLogService.insert(commandInfoLog);
}
Thread.sleep(200);
}
@@ -695,12 +804,12 @@
log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
//閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
- 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)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ //log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
Integer siteId = staProtocol.getSiteId();
staProtocol = station.get(siteId);
@@ -708,13 +817,6 @@
staProtocol.setPakMk(true);
}
- //鏇存柊浠诲姟姝ュ簭
- TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
- if (taskWrk != null) {
- taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
- taskWrkService.updateById(taskWrk);
- }
}
}
--
Gitblit v1.9.1