From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 167 +++++++------------------------------------------------
1 files changed, 22 insertions(+), 145 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 16309e4..e3e3703 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,7 +8,6 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
@@ -42,16 +41,12 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- private int barcodeSize = 2;
- 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(108);
- }};
+ private int barcodeSize = 10;
- public boolean charge0;
- public boolean charge1;
- public boolean charge2;
+ public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+ add(100);add(101);
+ add(102);add(103);
+ }};
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -75,18 +70,15 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write((StaProtocol)task.getData());
- break;
- // 鍑哄叆搴撴ā寮�
- case 3:
- write3((int)task.getData());
+ write((StaProtocol) task.getData());
+ read();
break;
default:
break;
}
// 蹇冭烦
// heartbeat();
- Thread.sleep(400);
+ Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
}
@@ -109,7 +101,7 @@
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("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
- siemensS7Net.ConnectClose();
+// siemensS7Net.ConnectClose();
return result;
}
@@ -117,7 +109,7 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*4));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.0", (short) (staNos.size()*4));
if (result.IsSuccess) {
for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -131,12 +123,13 @@
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4+2)); // 鐩爣绔�
}
}
+
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNos.size()));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB1001.0", (short) (staNos.size()*2));
if (result1.IsSuccess) {
for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -144,86 +137,14 @@
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
+ staProtocol.setLiftArrival(status[6]); // 鎻愬崌鏈哄埌浣嶄俊鍙�
+ staProtocol.setShuttleTakeEnable(status[7]); // 鎻愬崌鏈哄彲鍙栦俊鍙�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
}
}
-
- //璇绘潯鐮�
- Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)24);
- 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);
- }
- }
- }
-
- // 鍏呯數淇″彿浣�1
- Thread.sleep(50);
- OperateResultExOne<byte[]> result32 = siemensS7Net.Read("DB102.109", (short)1);
- if (result32.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result32.Content, 0, 1);
- charge0 = status[0]; //1:鍙互鍏呯數 0锛氬彲鑳界绾� 鍙兘鍦ㄥ厖鐢�
- }
- // 鍏呯數淇″彿浣�2
- Thread.sleep(50);
- OperateResultExOne<byte[]> result31 = siemensS7Net.Read("DB100.201", (short)1);
- if (result31.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result31.Content, 0, 1);
- charge1 = status[0];
- }
-
- // 澶栧舰妫�娴� - 102
- Thread.sleep(50);
- OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB102.110", (short)1);
- if (result102.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result102.Content, 0, 1);
- StaProtocol staProtocol = station.get(102);
- 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]);// 鎵爜澶辫触
- }
-// // 澶栧舰妫�娴� - 201
-// Thread.sleep(50);
-// OperateResultExOne<byte[]> result201 = siemensS7Net.Read("DB102.112", (short)1);
-// if (result201.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result201.Content, 0, 1);
-// StaProtocol staProtocol = station.get(201);
-// 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]);
-// }
-// // 澶栧舰妫�娴� - 301
-// Thread.sleep(50);
-// OperateResultExOne<byte[]> result301 = siemensS7Net.Read("DB102.114", (short)1);
-// if (result301.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result301.Content, 0, 1);
-// StaProtocol staProtocol = station.get(301);
-// 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 (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -234,6 +155,7 @@
for (Integer siteId : staNos) {
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
+// log.info("杈撻�佺嚎淇″彿锛寋}", JSON.toJSONString(staProtocol));
}
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
if (!basDevpService.updateBatchById(basDevps)) {
@@ -247,35 +169,6 @@
} 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("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- }
- /**
- * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
- */
- private void write3(int outAndIn) throws InterruptedException{
- if (Cools.isEmpty(outAndIn)) {
- return;
- }
- if (outAndIn==666){
- siemensS7Net.Write("DB100.200", (short) 1);
- }else if (outAndIn==999){
- siemensS7Net.Write("DB100.200", (short) 0);
- }else {
- String Db=null;
- if (outAndIn<20){
- Db="DB100.180";
- }else if (outAndIn<30){
- Db="DB100.182";
- }else {
- Db="DB100.184";
- }
- if (outAndIn == 11 || outAndIn == 21 || outAndIn == 31){
- siemensS7Net.Write(Db, (byte) 1); // 鍏ュ簱
- }else if (outAndIn == 12 || outAndIn == 22 || outAndIn == 32){
- siemensS7Net.Write(Db, (byte) 2); // 鍑哄簱
- }else if (outAndIn == 10 || outAndIn == 20 || outAndIn == 30){
- siemensS7Net.Write(Db, (byte) 0); // 鍑哄簱
- }
}
}
@@ -299,11 +192,11 @@
int writeCount = 0;
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
- while(writeCount < 5){
- writeResult = siemensS7Net.Write("DB100." + index*4, array); // 宸ヤ綔鍙枫�佺洰鏍囩珯
+ while(writeCount < 1){
+ writeResult = siemensS7Net.Write("DB1000." + index*4, array); // 宸ヤ綔鍙枫�佺洰鏍囩珯
if(writeResult.IsSuccess){
- Thread.sleep(200);
- OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*4, (short)4);
+ Thread.sleep(500);
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
if(readResult.IsSuccess){
short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
@@ -342,8 +235,8 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
- boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+// //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
+// boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
read();//璇诲彇1娆¤澶囩姸鎬�
return;
} else {
@@ -382,22 +275,6 @@
if (null != staProtocol) {
staProtocol.setPakMk(pakMk);
}
- }
-
- /**
- * 鍏呯數鎺у埗
- * @param index 鍏呯數妗╁簭鍙� 0 寮�濮�
- * @param open true 寮�濮嬪厖鐢碉紱false 缁撴潫鍏呯數
- */
- public boolean charge(int index, boolean open) {
- OperateResult write = siemensS7Net.Write("DB102.50." + (index + 3), open);
- if (!write.IsSuccess) {
- News.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗澶辫触", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
- return false;
- } else {
- News.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗鎴愬姛", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
- }
- return true;
}
@Override
--
Gitblit v1.9.1