From 6c419768ae32a5b8f5d5d31527cfb7485d56523e Mon Sep 17 00:00:00 2001 From: NL000364 <2217704789@qq.com> Date: Tue, 11 Mar 2025 16:46:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=87=AA=E5=8A=A8=E5=A4=8D=E4=BD=8D=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=202.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=8B=E5=8F=91=E6=9D=A1=E7=A0=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=88=B0plc=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseReadAndWriteUtilForUdpProtocol.java | 109 ++++++++++-------- .../plc/customer/base/PlcCoreDealService.java | 24 +++- .../ATLCapacityMachinePlcHandlerImpl.java | 7 ++ plcpluginsrc/atlPlcHandler/src/testMain.java | 17 ++- .../plc/core/handler/PlcBusinessHandler.java | 9 ++ 5 files changed, 109 insertions(+), 57 deletions(-) diff --git a/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/BaseReadAndWriteUtilForUdpProtocol.java b/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/BaseReadAndWriteUtilForUdpProtocol.java index 2c3cd4d..af465ae 100644 --- a/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/BaseReadAndWriteUtilForUdpProtocol.java +++ b/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/BaseReadAndWriteUtilForUdpProtocol.java @@ -2,18 +2,15 @@ package com.nlteck.plc.customer.base; import com.nlteck.plc.common.util.CommonUtil; import com.nlteck.plc.common.util.GsonUtil; -import com.nlteck.plc.customer.common.ATLPlcDefine; +import com.nlteck.plc.common.util.LogUtil; import com.nlteck.plc.finsUdp.BytesUtil; import com.nlteck.plc.finsUdp.FinsUdpModel; import com.nlteck.plc.finsUdp.FinsUdpProtocol; import com.nlteck.plc.finsUdp.FinsUdpProtocol.DataArea; import com.nlteck.plc.finsUdp.UDPSocket; -import com.nltecklib.utils.BaseUtil; import org.apache.log4j.Logger; -import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.List; import static com.nlteck.plc.customer.common.CommonConstant.LOG_BASE_PATH; @@ -23,7 +20,7 @@ import static com.nlteck.plc.customer.common.CommonConstant.LOG_BASE_PATH; */ public class BaseReadAndWriteUtilForUdpProtocol { - private static Logger logger = Logger.getLogger(LOG_BASE_PATH + "BaseReadAndWriteUtil"); + private static final Logger logger = LogUtil.getLogger(LOG_BASE_PATH + "BaseReadAndWriteUtil"); protected static boolean writeBoolValue(String address, boolean value, UDPSocket udpSocket) throws Exception { if (udpSocket == null) { @@ -31,10 +28,10 @@ public class BaseReadAndWriteUtilForUdpProtocol { } // "W33.01" - boolean rst = false; - String oriAdress = address; + boolean rst; + String oriAddress = address; DataArea area = DataArea.DW; - int endIndex = oriAdress.indexOf("."); + int endIndex = oriAddress.indexOf("."); int offset = 0; if (address.startsWith("D")) { @@ -42,97 +39,107 @@ public class BaseReadAndWriteUtilForUdpProtocol { area = DataArea.WB; } if (endIndex < 0) { - address = oriAdress.substring(1); + address = oriAddress.substring(1); } else { - address = oriAdress.substring(1, endIndex); - offset = Integer.parseInt(oriAdress.substring(endIndex)); + address = oriAddress.substring(1, endIndex); + offset = Integer.parseInt(oriAddress.substring(endIndex)); } FinsUdpProtocol finsUdpProtocol = new FinsUdpProtocol(0, 222); // W200.05 FinsUdpModel.writeBit(udpSocket, finsUdpProtocol, area, Integer.parseInt(address), offset, value); - logger.info("writeBoolValue - "+oriAdress + "写入值：" + value); + logger.info("writeBoolValue - " + oriAddress + "写入值：" + value); rst = true; return rst; } - protected static boolean writeByteValue(String address, int value, UDPSocket udpSocket) throws Exception { + protected static void writeByteValue(String address, int value, UDPSocket udpSocket) { if (udpSocket == null) { throw new RuntimeException("udpSocket对象不能为空，请检查！"); } - -// "W33.01" - boolean rst = false; - String oriAdress = address; + String oriAddress = address; DataArea area = DataArea.DW; - int endIndex = oriAdress.indexOf("."); - int offset = 0; - if (address.startsWith("D")) { - - } else if (address.startsWith("W")) { + int endIndex = oriAddress.indexOf("."); + if (address.startsWith("W")) { area = DataArea.WB; } if (endIndex < 0) { - address = oriAdress.substring(1); + address = oriAddress.substring(1); } else { - address = oriAdress.substring(1, endIndex); - offset = Integer.parseInt(oriAdress.substring(endIndex)); + address = oriAddress.substring(1, endIndex); } FinsUdpProtocol finsUdpProtocol = new FinsUdpProtocol(0, 192); int[] data = new int[]{value}; - List datas = finsUdpProtocol.writeEncode(FinsUdpModel.write(data, area, Integer.parseInt(address))); - byte[] result = null; + List datum = finsUdpProtocol.writeEncode(FinsUdpModel.write(data, area, Integer.parseInt(address))); + byte[] result; try { - - result = udpSocket.sendMsg(BytesUtil.convertArray(datas)); - + result = udpSocket.sendMsg(BytesUtil.convertArray(datum)); int wCode = finsUdpProtocol.decodeWrite(result).getWriteResult(); - logger.info("设定压力读取int[]，结果：" + wCode); + logger.info("写入读取int[]，结果：" + wCode); } catch (Exception e) { logger.info(CommonUtil.getThrowableException(e)); } - logger.info("writeByteValue."+oriAdress + "写入值：" + value); - rst = true; - return rst; + logger.info("writeByteValue." + oriAddress + "写入值：" + value); } - - // Function to read a single BIT value from the PLC - - // Function to read a single BYTE value from the PLC protected static byte readByteValue(String address, UDPSocket udpSocket) throws Exception { if (udpSocket == null) { throw new RuntimeException("udpSocket对象不能为空，请检查！"); } - - boolean rst = false; - String oriAdress = address; + String oriAddress = address; DataArea area = DataArea.DW; - int endIndex = oriAdress.indexOf("."); - int offset = 0; - if (address.startsWith("D")) { - - } else if (address.startsWith("W")) { + int endIndex = oriAddress.indexOf("."); + if (address.startsWith("W")) { area = DataArea.WB; } if (endIndex < 0) { - address = oriAdress.substring(1); + address = oriAddress.substring(1); } else { - address = oriAdress.substring(1, endIndex); - offset = Integer.parseInt(oriAdress.substring(endIndex)); + address = oriAddress.substring(1, endIndex); } FinsUdpProtocol finsUdpProtocol = new FinsUdpProtocol(0, 192); short info = (short) FinsUdpModel.read(udpSocket, finsUdpProtocol, area, Integer.parseInt(address)); - logger.info("readByteValue.info:"+ GsonUtil.toJson(info)); + logger.info("readByteValue.info:" + GsonUtil.toJson(info)); return (byte) info; } - // Function to read a list of BYTE values from the PLC + protected static void writeBatchByteValue(String address, List values, UDPSocket udpSocket) { + if (udpSocket == null) { + throw new RuntimeException("udpSocket对象不能为空，请检查！"); + } + String oriAddress = address; + DataArea area = DataArea.DW; + int endIndex = oriAddress.indexOf("."); + if (address.startsWith("W")) { + area = DataArea.WB; + } + if (endIndex < 0) { + address = oriAddress.substring(1); + } else { + address = oriAddress.substring(1, endIndex); + } + FinsUdpProtocol finsUdpProtocol = new FinsUdpProtocol(0, 192); + + int[] data = values.stream().mapToInt(Integer::intValue).toArray(); + List datum = finsUdpProtocol.writeEncode(FinsUdpModel.write(data, area, Integer.parseInt(address))); + byte[] result; + + try { + result = udpSocket.sendMsg(BytesUtil.convertArray(datum)); + int wCode = finsUdpProtocol.decodeWrite(result).getWriteResult(); + + logger.info("写入读取int[]，结果：" + wCode); + } catch (Exception e) { + logger.info(CommonUtil.getThrowableException(e)); + } + + logger.info("writeByteValue." + oriAddress + "写入值：" + values); + } } diff --git a/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/PlcCoreDealService.java b/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/PlcCoreDealService.java index 8c1d255..c6c7e9a 100644 --- a/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/PlcCoreDealService.java +++ b/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/base/PlcCoreDealService.java @@ -16,9 +16,11 @@ import org.apache.log4j.Logger; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import static com.nlteck.plc.customer.base.BaseReadAndWriteUtilForUdpProtocol.*; import static com.nlteck.plc.customer.common.CommonConstant.LOG_BASE_PATH; @@ -465,7 +467,10 @@ public class PlcCoreDealService { //解析夹具状态信号 1：夹具压紧 0：夹具张开 fixture.open = vals.get(4) == 0; - + //流程完成信号 0：在测试中，未完成 1：化成完成； 2：夹具导出数据完成后； 3：导出数据完成后置为3 + if (fixture.batExist1 && vals.get(5) == 0) { + this.dealResetComplete(fixtureIndex); + } //解析夹具师傅有料 1：夹具有料 0：夹具无料 fixture.batExist1 = vals.get(5) == 1; @@ -502,10 +507,7 @@ public class PlcCoreDealService { } fixture.status = statusStr; - //流程完成信号 0：在测试中，未完成 1：化成完成； 2：夹具导出数据完成后； 3：导出数据完成后置为3 - if (fixture.batExist1 && vals.get(5) == 0) { - this.dealResetComplete(fixtureIndex); - } + fixture.complete = vals.get(13) == 1; fixture.exportDateCompete = vals.get(13) == 3; @@ -712,4 +714,16 @@ public class PlcCoreDealService { writeByteValue(completeAddr, val, udpSocket); logger.info("复位夹具" + (fixtureIndex) + "完成信号"); } + + public void writeBarcodeResult(int fixtureIndex, Map map) { + Logger logger = LogUtil.getLogger(LOG_BASE_PATH + "writeBarcodeResults"); + String barcodeResultAddr = "D" + (ATLPlcDefine.ADD_BARCODE_RESULT + fixtureIndex * ATLPlcDefine.FIXTURE_ADD_INTERVAL); + List sortedValues = map.entrySet() + .stream() + .sorted(Map.Entry.comparingByKey()) // 按 key 排序 + .map(Map.Entry::getValue) // 提取 value + .collect(Collectors.toList()); // 收集为 List + writeBatchByteValue(barcodeResultAddr, sortedValues, udpSocket); + logger.info("写入条码测试结果" + sortedValues); + } } diff --git a/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/handler/ATLCapacityMachinePlcHandlerImpl.java b/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/handler/ATLCapacityMachinePlcHandlerImpl.java index fa701c3..fad026d 100644 --- a/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/handler/ATLCapacityMachinePlcHandlerImpl.java +++ b/plcpluginsrc/atlPlcHandler/src/com/nlteck/plc/customer/handler/ATLCapacityMachinePlcHandlerImpl.java @@ -5,6 +5,8 @@ import com.nlteck.plc.core.enums.AlertType; import com.nlteck.plc.core.handler.PlcBusinessHandler; import com.nlteck.plc.customer.base.PlcCoreDealService; +import java.util.Map; + public class ATLCapacityMachinePlcHandlerImpl implements PlcBusinessHandler { @@ -187,4 +189,9 @@ public class ATLCapacityMachinePlcHandlerImpl implements PlcBusinessHandler { coreDealService.dealStopSignalInteraction(fixtureIndex, val); } + @Override + public void issueBarcodeTestResult(int fixtureIndex, Map map) { + coreDealService.writeBarcodeResult(fixtureIndex, map); + } + } diff --git a/plcpluginsrc/atlPlcHandler/src/testMain.java b/plcpluginsrc/atlPlcHandler/src/testMain.java index ec94df2..4a0536a 100644 --- a/plcpluginsrc/atlPlcHandler/src/testMain.java +++ b/plcpluginsrc/atlPlcHandler/src/testMain.java @@ -1,11 +1,26 @@ import com.nlteck.plc.customer.handler.ATLCapacityMachinePlcHandlerImpl; +import java.util.HashMap; +import java.util.Map; + public class testMain { public static void main(String[] args) { try { ATLCapacityMachinePlcHandlerImpl plcHandler = new ATLCapacityMachinePlcHandlerImpl(); - plcHandler.startRun("127.0.0.1", "10.110.59.1"); + plcHandler.startRun("127.0.0.1", "127.0.0.1"); + Map map = new HashMap<>(); + map.put(3,3); + map.put(1,1); + map.put(4,4); + map.put(2,2); + map.put(5,5); + map.put(6,6); + map.put(10,10); + map.put(11,11); + map.put(7,7); + map.put(8,8); + plcHandler.issueBarcodeTestResult(0,map); } catch (Exception e) { e.printStackTrace(); } diff --git a/plcpluginsrc/plcCore/src/com/nlteck/plc/core/handler/PlcBusinessHandler.java b/plcpluginsrc/plcCore/src/com/nlteck/plc/core/handler/PlcBusinessHandler.java index aa94401..f2b4d4f 100644 --- a/plcpluginsrc/plcCore/src/com/nlteck/plc/core/handler/PlcBusinessHandler.java +++ b/plcpluginsrc/plcCore/src/com/nlteck/plc/core/handler/PlcBusinessHandler.java @@ -2,6 +2,8 @@ package com.nlteck.plc.core.handler; import com.nlteck.plc.core.enums.AlertType; +import java.util.Map; + /** * plc业务处理接口，定义一些规范接口，底下需要有实现类实现接口 */ @@ -117,4 +119,11 @@ public interface PlcBusinessHandler { * @throws Exception */ void stopSignalInteraction(int fixtureIndex,int val) throws Exception; + + /** + * 下发所有通道电池测试结果到plc，1.ok 2.ng + * @param fixtureIndex + * @param map + */ + void issueBarcodeTestResult(int fixtureIndex, Map map); }