root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 自动门、ndc链接

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-07-10 09:09:24 +08:00
parent 0de981287c
commit 5cfe00a806
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -78,11 +79,17 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
ip = paramService.findByCode(AcsConfig.AGVURL).getValue(); ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue()); port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
byte[] data = null;
try { try {
InetSocketAddress socketAddress = new InetSocketAddress(ip, port);
byte[] b = new byte[1024]; byte[] b = new byte[1024];
s = new Socket(ip, port); s = new Socket();
s.connect(socketAddress,2*1000);
s.setKeepAlive(true);//长链接
// s.setSoTimeout(1000* 60 * 10);//读取超时时间
dos = new DataOutputStream(s.getOutputStream()); dos = new DataOutputStream(s.getOutputStream());
dis = new DataInputStream(s.getInputStream()); dis = new DataInputStream(s.getInputStream());
System.out.println("1楼NDCAgv链接成功"); System.out.println("1楼NDCAgv链接成功");
@@ -113,7 +120,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//System.out.println("收到请求参数：" + bs); //System.out.println("收到请求参数：" + bs);
boolean flag = false; boolean flag = false;
if (arr[8] * 256 + arr[9] == 0x73) { if (arr[8] * 256 + arr[9] == 0x73) {
byte[] data = null;
System.out.println("接收agv上报信息：" + bs); System.out.println("接收agv上报信息：" + bs);
//执行阶段 //执行阶段
int phase = arr[16] * 256 + arr[17]; int phase = arr[16] * 256 + arr[17];
@@ -221,15 +227,17 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
} }
if (!ObjectUtil.isEmpty(data)) {
write(data);
}
} else { } else {
System.out.println("agv上报不是0073类型动作，不处理"); System.out.println("agv上报不是0073类型动作，不处理");
} }
} }
if (!ObjectUtil.isEmpty(data)) {
write(data);
data = null;
}
} catch (Exception e) { } catch (Exception e) {
System.out.println("OneAgv链接异常"); System.out.println("OneAgv链接异常");
log.info("OneAgv链接异常"); log.info("OneAgv链接异常");

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -58,7 +58,9 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
} }
if (close != last_close) { if (close != last_close) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close); logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close);
if(close ==1 ){
this.writing("to_close","0");
}
} }
if (toClose != last_toClose) { if (toClose != last_toClose) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号toClose：" + last_toClose + "->" + toClose); logServer.deviceExecuteLog(this.device_code, "", "", "信号toClose：" + last_toClose + "->" + toClose);