From e6eb8d8dc97c1fb40581ffa1d5b17ecc37d39e2e Mon Sep 17 00:00:00 2001 From: 18516761980 <56479841@qq.com> Date: 星期二, 30 八月 2022 15:34:18 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 92 +++++++++++++++++++++++++-------------------- 1 files changed, 51 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 8fceff3..662404d 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -8,13 +8,9 @@ import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SpringUtils; -import com.google.common.base.Utf8; -import com.sun.xml.internal.bind.v2.runtime.output.Encoded; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.service.BasDevpService; -import com.zy.asrs.service.WrkMastService; import com.zy.core.DevpThread; -import com.zy.core.Slave; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; @@ -25,7 +21,6 @@ import com.zy.core.model.protocol.StaProtocol; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import java.text.MessageFormat; import java.util.ArrayList; @@ -47,16 +42,25 @@ private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>(); private short heartBeatVal = 1; public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{ - add(101);add(102);add(103);add(104); - add(201);add(202);add(203);add(204); - add(301);add(302);add(303);add(304);add(305);add(306); + 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(201);add(202);add(203);add(204);add(205);add(206);add(207);add(208);add(209);add(210);add(211);add(212); }}; /** * 鏉$爜鏁伴噺 */ - private int barcodeSize = 1; - public IoModeType ioMode = IoModeType.NONE; + private int barcodeSize = 3; + + /** + * 鍏ュ嚭搴撴ā寮� + * 0锛氭湭鐭� + * 1锛氬叆搴撳惎鍔ㄤ腑 + * 2.鍏ュ簱妯″紡 + * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛� + * 4.鍑哄簱妯″紡 + */ + public IoModeType ioModeOf2F = IoModeType.NONE; +// public IoModeType ioMode = IoModeType.NONE; public SiemensDevpThread(DevpSlave slave) { this.slave = slave; @@ -136,26 +140,13 @@ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2)); // 鐩爣绔� } } -// Thread.sleep(200); -// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186); -// if (result0.IsSuccess) { -// for (int i = 0; i < 93; 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.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔� -// } -// } + Thread.sleep(200); - OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB150.0", (short) (staNoSize*2)); + OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize)); if (result1.IsSuccess) { for (int i = 0; i < staNoSize; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 - boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1); + boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1); StaProtocol staProtocol = station.get(siteId); staProtocol.setAutoing(status[0]); // 鑷姩 staProtocol.setLoading(status[1]); // 鏈夌墿 @@ -172,17 +163,36 @@ } } - Thread.sleep(200); - OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(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(200); +// OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.160",(short)4); +// 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); +// } +// } +// +// } + //RGV鍙拌溅浣嶇疆 + Thread.sleep(200); + OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)4); + if (result3.IsSuccess) { + for (int i = 0; i < 2; i++) { + Integer siteId = i==0 ? 112 : 212; // 绔欑偣缂栧彿 + StaProtocol staProtocol = station.get(siteId); + if (null == staProtocol) { + staProtocol = new StaProtocol(); + staProtocol.setSiteId(siteId); + station.put(siteId, staProtocol); + } + staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2))); +// String aa = staProtocol.getNearbySta(); +// System.out.println(siteId + "===>>" + staProtocol.getNearbySta()); + } } // OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0"); @@ -226,7 +236,7 @@ return; } int index = staNos.indexOf(staProtocol.getSiteId()); - short[] array = new short[10]; + short[] array = new short[2]; array[0] = staProtocol.getWorkNo(); array[1] = staProtocol.getStaNo(); OperateResult write = siemensS7Net.Write("DB100." + index*4, array); @@ -250,10 +260,10 @@ // 鏇存柊鍏ュ嚭搴撴ā寮� private void updateIoMode() throws InterruptedException { - if (this.ioMode != IoModeType.NONE) { - if (!siemensS7Net.Write("DB200", this.ioMode.id).IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); - log.error("鍐欏叆杈撻�佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId()); + 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())); + log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId()); } } } -- Gitblit v1.9.1