From 7d868dd12ce3aa089c496d7d92012a116dc5baf6 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期日, 01 九月 2024 16:00:09 +0800 Subject: [PATCH] 对照协议调整 --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 17 ++++++++ src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 -- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 63 +++---------------------------- 3 files changed, 23 insertions(+), 62 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 5a2499d..a503dab 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -801,7 +801,6 @@ flag = true; } if (!flag) { - System.out.println(staProtocol); //TODO News.error("" + mark + " - 1" + " - 3" + " - 鍫嗗灈鏈哄叆搴撶珯淇℃伅(浠ヤ笅闇�瑕佸叏true):" + "鑷姩淇″彿" + staProtocol.isAutoing() + "鏈夌墿淇″彿" + staProtocol.isLoading() @@ -809,23 +808,19 @@ + "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanining()); continue; } - System.out.println("wrkMast:" + slave.getId() + "-" + staProtocol.getWorkNo().intValue() + "-" + crnStn.getStaNo()); // 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。 WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo()); - System.out.println("wrkMast:" + wrkMast); if (null == wrkMast) { News.infoNoLog("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo()); // log.error("鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts=2, 宸ヤ綔鍙�={}", staProtocol.getWorkNo()); continue; } - System.out.println("566"); // 鑾峰彇搴撲綅淇℃伅 LocMast locMast = locMastService.getById(wrkMast.getLocNo()); if (locMast == null) { News.error("" + mark + " - 1" + " - 5" + " - 鏌ヨ搴撳瓨鏃犳暟鎹�--搴撲綅鍙穥}", wrkMast.getLocNo()); continue; } - System.out.println("334"); if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) { News.error("" + mark + " - 1" + " - 6" + " - 鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), locMast.getLocSts()); continue; diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java index b8d889f..6e9d327 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -81,6 +81,23 @@ // 鎵爜澶辫触 private boolean barcodeErr; + //鏁呴殰----------------------------------------------------------------------- + private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅� + + private Boolean infraredErr = false; //鍏夌數寮傚父 + + private Boolean outTimeErr = false; //杩愯瓒呮椂 + + private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂 + + private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅� + + private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅� + + private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅� + + private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅� + public BasDevp toSqlModel() { BasDevp basDevp = new BasDevp(); basDevp.setDevNo(siteId); diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index db4c97e..55297e1 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -69,6 +69,7 @@ add(101); add(102); add(103); + add(104); add(200); add(201); add(202); @@ -204,7 +205,7 @@ private void read() throws InterruptedException { // // 鏇存柊鍏ュ嚭搴撴ā寮� // updateIoMode(); - ArrayList<Integer> staNos = getStaNo(); + ArrayList<Integer> staNos = staNosAll; int staNoSize = staNos.size(); OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8)); // OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2)); @@ -245,21 +246,6 @@ } -// 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); //ArrayList<Integer> barcodeList = BarcodeList; @@ -267,46 +253,12 @@ if (result2.IsSuccess) { for (int i = 0; i < 3; i++) { String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8"); - BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i); + BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { barcodeThread.setBarcode(barcode); - News.info(" - 7" + " - 鎵爜澶辫触2 ===>> {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{},绔欑偣:{}", barcode); } } } - //鏉$爜鎵弿鍣� -// Thread.sleep(200); -// OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2", (short) (barcodeSize * 8)); -// if (result2.IsSuccess) { -// if (slave.getId() == 1) { -// for (int i = 0; i < barcodeSize / 3; 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)) { -//// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) { -// barcodeThread.setBarcode(barcode); -// } -// } -// } else if (slave.getId() == 2) { -// for (int i = barcodeSize / 3; i < barcodeSize; i++) { -// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, (i - barcodeSize / 3) * 8, 8, "UTF-8"); -// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); -// if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { -//// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) { -// barcodeThread.setBarcode(barcode); -// } -// } -// } else if (slave.getId() == 3) { -// for (int i = barcodeSize / 3 + 1; i < barcodeSize; i++) { -// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, (i - (barcodeSize / 3) * 2) * 8, 8, "UTF-8"); -// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); -// if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { -//// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) { -// barcodeThread.setBarcode(barcode); -// } -// } -// } -// } Thread.sleep(200); @@ -336,12 +288,12 @@ } } -//plc鏁呴殰 - OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.300", (short) (staNoSize*4)); + //plc鏁呴殰 + OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.300", (short) (staNoSize * 4)); if (resultErr2.IsSuccess) { for (int i = 0; i < staNoSize; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 - boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4, 1); + boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * 4, 1); StaProtocol staProtocol = station.get(siteId); staProtocol.setBreakerErr(status[0]); staProtocol.setInfraredErr(status[1]); @@ -356,9 +308,7 @@ } if (result.IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId())); - // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴� try { List<BasDevp> basDevps = new ArrayList<>(); @@ -366,7 +316,6 @@ StaProtocol staProtocol = station.get(siteId); basDevps.add(staProtocol.toSqlModel()); } - BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class); if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) { throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�"); -- Gitblit v1.9.1