From 935275e79de8415ee3ca0b9a45da548aa6a2ee34 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 六月 2025 08:21:36 +0800
Subject: [PATCH] 更新最新代码，上片页面领取任务传递固定值修改为动态获取线路
---
JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/ModbusTcp.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/ModbusTcp.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/ModbusTcp.java
index 335a30a..6248f29 100644
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/ModbusTcp.java
+++ b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/ModbusTcp.java
@@ -2,23 +2,18 @@
import com.mes.tools.HexConversion;
import com.mes.utils.HexUtil;
-import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.Socket;
-import java.net.UnknownHostException;
-import java.text.SimpleDateFormat;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import static com.mes.tools.HexConversion.*;
+import static com.mes.tools.HexConversion.intToBytesDesc;
@Component
@Slf4j
@@ -46,7 +41,7 @@
public void connect(){
try {
this.socket=new Socket(Ip,Port);
- this.socket.setSoTimeout(1000);
+ this.socket.setSoTimeout(300);
}catch (Exception e) {
log.info("The IP address of the host cannot be determined:{}",e.getMessage());
}
@@ -102,7 +97,10 @@
bit[0]=Byte.parseByte(fontBitString[plcParameter.getAddressLength()]);
plcParameter.setReadByte(bit);
}else{
- plcParameter.setReadByte(Arrays.copyOfRange(content,plcParameter.getAddressStart(),(plcParameter.getAddressStart()+plcParameter.getAddressLength())));
+ String plcAddressBegin = plcAgreement.plcAddressBegin;
+ Integer addressIndex = plcParameter.getAddressStart();
+ int address = addressIndex -HexUtil.hexToInt(plcAddressBegin)*2;
+ plcParameter.setReadByte(Arrays.copyOfRange(content,address,(address+plcParameter.getAddressLength())));
}
}
return true;
--
Gitblit v1.8.0