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

opt:优化

Browse Source
This commit is contained in:
zds
2025-03-13 18:42:45 +08:00
parent 108e5e8e72
commit e1fdf21977
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import org.nl.system.service.dict.dao.Dict;
import org.nl.system.service.lucene.LuceneExecuteLogService; import org.nl.system.service.lucene.LuceneExecuteLogService;
import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.ISysParamService;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -44,10 +43,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
static DataInputStream dis; static DataInputStream dis;
private int recordTimeOut = 10000; private int recordTimeOut = 10000;
private Date recordTime; private Date recordTime;
String[] ERROR = new String[]{
"货叉尖部传感器触发", "S300传感器触发", "载货状态改变", "急停按钮触发", "触边开关出发", "需要复位",
"停在充电位", "取货失败", "放货失败", "轮子打滑", "没有动作码不能进入站点", "取货时有货", "丢失定位",
"抬叉停止"};
boolean bConnected = true; boolean bConnected = true;
boolean isReConnect = false; boolean isReConnect = false;
@@ -76,7 +71,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
public void autoRun() throws IOException { public void autoRun() throws IOException {
System.out.println("NDCAgv链接开始"); System.out.println("NDCAgv链接开始");
ISysParamService ISysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class);
InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class);
NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class); NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class);
DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class);
@@ -127,7 +121,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//车号 //车号
int carno = arr[20]; int carno = arr[20];
//充电桩站点号 //充电桩站点号
int station=arr[25]; int station = arr[25];
Instruction link_inst = null; Instruction link_inst = null;
Instruction inst = null; Instruction inst = null;
boolean link_flag = false; boolean link_flag = false;
@@ -141,7 +135,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
link_flag = true; link_flag = true;
} }
log.info("接收agv上报信息：" + bs); log.info("接收agv上报信息：" + bs);
log.info("接收agv上报信息：" + "phase--" + phase + " index--" + index + " ikey--" + ikey + " agvaddr--" + agvaddr + " carno--" + carno); log.info("接收agv上报信息：" + "phase--" + phase + " index--" + index + " ikey--" + ikey + " agvaddr--" + agvaddr + " carno--" + carno+ " station--" + station);
Device device = null; Device device = null;
String device_code = null; String device_code = null;
String old_device_code = null; String old_device_code = null;
@@ -242,7 +236,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//充电任务下发成功上报 //充电任务下发成功上报
} else if (phase == 0x64){ } else if (phase == 0x64){
log.info("AGV车号{}反馈充电任务下发成功，锁定充电桩{}",agvaddr,station); log.info("AGV车号{}反馈充电任务下发成功，锁定充电桩{}",agvaddr,station);
Dict dict = dictService.getDictByName3("station",null,String.valueOf(station)); Dict dict = dictService.getDictByName3("station",String.valueOf(agvaddr),null);
if (ObjectUtil.isNotEmpty(dict)){ if (ObjectUtil.isNotEmpty(dict)){
dict.setValue("1"); dict.setValue("1");
dict.setPara2(String.valueOf(agvaddr)); dict.setPara2(String.valueOf(agvaddr));
@@ -255,11 +249,11 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//充电取消上报 //充电取消上报
}else if (phase == 0x66){ }else if (phase == 0x66){
log.info("AGV车号{}反馈充电任务已取消，释放充电桩{}",agvaddr,station); log.info("AGV车号{}反馈充电任务已取消，释放充电桩{}",agvaddr,station);
Dict dict = dictService.getDictByName3("station",String.valueOf(agvaddr),String.valueOf(station)); Dict dict = dictService.getDictByName3("station",String.valueOf(agvaddr),null);
if (ObjectUtil.isNotEmpty(dict)){ if (ObjectUtil.isNotEmpty(dict)){
dict.setValue("0"); dict.setValue("0");
dict.setPara2(""); dict.setPara2("");
dict.setPara3(""); dict.setPara3("充电桩空闲");
dictService.updateDetail(dict); dictService.updateDetail(dict);
} }
} }