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

opt:优化任务反馈

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-24 15:07:48 +08:00
parent 00bbc35055
commit 5413cfc420
9 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,11 +260,12 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
// TODO Auto-generated catch block // TODO Auto-generated catch block
try { try {
Thread.sleep(5000L); Thread.sleep(5000L);
log.info("再次下发agv数据:" + Bytes2HexString(b)); log.error("tofix下发agv数据失败，再次下发，再次下发agv数据:" + Bytes2HexString(b)+"失败原因："+e.getMessage());
System.out.println("再次下发agv数据:" + Bytes2HexString(b)); System.out.println("再次下发agv数据:" + Bytes2HexString(b));
dos.write(b); dos.write(b);
dos.flush(); dos.flush();
} catch (Exception e1) { } catch (Exception e1) {
log.error("tofix下发agv数据失败，再次下发，下发agv数据:" + Bytes2HexString(b)+"失败原因："+e1.getMessage());
e1.printStackTrace(); e1.printStackTrace();
} }

6
nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -131,7 +131,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
String device_code = null; String device_code = null;
if (phase == 0x67) { if (phase == 0x67) {
//故障信息 //todo 故障信息
if (arr[18] * 256 + arr[19] == 0) { if (arr[18] * 256 + arr[19] == 0) {
} }
@@ -196,8 +196,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey); logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
return; return;
} }
//到达桁架1请求取货 //到达桁架1请求取货
if (device.getDeviceDriver() instanceof Hj1DeviceDriver) { if (device.getDeviceDriver() instanceof Hj1DeviceDriver) {
hj1DeviceDriver = (Hj1DeviceDriver) device.getDeviceDriver(); hj1DeviceDriver = (Hj1DeviceDriver) device.getDeviceDriver();
@@ -833,7 +831,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
.device_code(device_code) .device_code(device_code)
.content("请求参数:" + jo) .content("请求参数:" + jo)
.requestparam("请求参数:" + jo) .requestparam("请求参数:" + jo)
.method("1111111111111111111111111111111feedAgvTaskStatus") .method("sendAgvErrorStatus")
.build(); .build();
luceneExecuteLogService.deviceExecuteLog(reqlogDto); luceneExecuteLogService.deviceExecuteLog(reqlogDto);
HttpResponse resp = acsToWmsService.feedAgvErrorStatus(ja); HttpResponse resp = acsToWmsService.feedAgvErrorStatus(ja);

2
nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
View File

@@ -102,7 +102,7 @@ public interface AcsToWmsService {
UpdateLKTaskResponse updateLKTaskRequest(UpdateLKTaskRequest updateLKTaskRequest); UpdateLKTaskResponse updateLKTaskRequest(UpdateLKTaskRequest updateLKTaskRequest);
// 输送线有货变成无货时向lms请求 // 向lms反馈AGV信息
HttpResponse shipDeviceUpdate(JSONObject param); HttpResponse shipDeviceUpdate(JSONObject param);
/** /**

6
nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -427,7 +427,11 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
} }
if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) { if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class); NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto); try {
ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
} catch (Exception e) {
log.error("tofix下发agv数据失败，失败原因：" + e.getMessage());
}
} else if (StrUtil.equals(shortPathsList.get(0).getType(), "2")) { } else if (StrUtil.equals(shortPathsList.get(0).getType(), "2")) {
ZheDaAgvService zheDaAgvService = SpringContextHolder.getBean(ZheDaAgvService.class); ZheDaAgvService zheDaAgvService = SpringContextHolder.getBean(ZheDaAgvService.class);
HttpResponse result = zheDaAgvService.sendAgvInstToAgv(dto); HttpResponse result = zheDaAgvService.sendAgvInstToAgv(dto);

19
nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -850,16 +850,13 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
taskMapper.updateById(task); taskMapper.updateById(task);
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
// while (iterator.hasNext()) { // while (iterator.hasNext()) {
// TaskDto task = iterator.next(); // TaskDto task = iterator.next();
// if (task.getTask_code().equals(dto.getTask_code())) { // if (task.getTask_code().equals(dto.getTask_code())) {
// iterator.remove(); // iterator.remove();
// } // }
// } // }
removeByCodeFromCache(entity.getTask_code()); removeByCodeFromCache(entity.getTask_code());
if (StrUtil.equals(dto.getTask_status(), "0") || StrUtil.equals(dto.getTask_status(), "1")) { if (StrUtil.equals(dto.getTask_status(), "0") || StrUtil.equals(dto.getTask_status(), "1")) {
tasks.add(dto); tasks.add(dto);
} }
@@ -870,7 +867,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
request.setTask_code(entity.getTask_code()); request.setTask_code(entity.getTask_code());
request.setTask_id(entity.getExt_task_id()); request.setTask_id(entity.getExt_task_id());
request.setTask_status(entity.getTask_status()); request.setTask_status(dto.getTask_status());
request.setRequest_medthod_code(RequestMethodEnum.feedback_task_status.getCode()); request.setRequest_medthod_code(RequestMethodEnum.feedback_task_status.getCode());
request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName()); request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName());
boolean flag = false; boolean flag = false;
@@ -880,8 +877,6 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
log.info("任务号:{},反馈wms任务状态完成成功,响应信息:{}!", entity.getTask_code(), resp); log.info("任务号:{},反馈wms任务状态完成成功,响应信息:{}!", entity.getTask_code(), resp);
} catch (Exception e) { } catch (Exception e) {
log.error("任务号:{},反馈wms任务状态失败,原因:{}!", entity.getTask_code(), e.getMessage()); log.error("任务号:{},反馈wms任务状态失败,原因:{}!", entity.getTask_code(), e.getMessage());
} finally {
} }
} }

14
nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java
View File

@@ -123,9 +123,9 @@ public class AutoCreateInst {
continue; continue;
} }
// if (!StrUtil.equals(shortPathsList.get(0).getType(), "1")) { // if (!StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
// continue; // continue;
// } // }
Device startdevice = appService.findDeviceByCode(start_device_code); Device startdevice = appService.findDeviceByCode(start_device_code);
Device nextdevice = appService.findDeviceByCode(next_device_code); Device nextdevice = appService.findDeviceByCode(next_device_code);
if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) { if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) {
@@ -144,12 +144,7 @@ public class AutoCreateInst {
//普通站点 //普通站点
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
// StandardEmptyPalletSiteDeviceDriver standardEmptsyPalletSiteDeviceDriver;
// LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
// LnshFoldDiscSiteDeviceDriver lnshFoldDiscSiteDeviceDriver;
String createTaskCheck = acsConfigService.findByCode(AcsConfig.CREATETASKCHECK).getValue(); String createTaskCheck = acsConfigService.findByCode(AcsConfig.CREATETASKCHECK).getValue();
if (StrUtil.equals(createTaskCheck, "1")) { if (StrUtil.equals(createTaskCheck, "1")) {
if (startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { if (startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) startdevice.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) startdevice.getDeviceDriver();
@@ -162,8 +157,6 @@ public class AutoCreateInst {
continue; continue;
} }
} }
//校验 是否同任务是否存在相同终点、未完成的指令 //校验 是否同任务是否存在相同终点、未完成的指令
int sameqty = instructionService.querySameDestinationInst(next_point_code); int sameqty = instructionService.querySameDestinationInst(next_point_code);
if (sameqty > 0) { if (sameqty > 0) {
@@ -173,7 +166,6 @@ public class AutoCreateInst {
continue; continue;
} }
} }
Instruction instdto = new Instruction(); Instruction instdto = new Instruction();
instdto.setInstruction_type(acsTask.getTask_type()); instdto.setInstruction_type(acsTask.getTask_type());
instdto.setInstruction_id(IdUtil.simpleUUID()); instdto.setInstruction_id(IdUtil.simpleUUID());

2
nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
View File

@@ -40,7 +40,7 @@ public class SyncDeviceStatus {
public void run() throws Exception { public void run() throws Exception {
rgv(); //rgv();
device(); device();
} }

2
nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -7,7 +7,7 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:qzyf_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:qzyf}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
# password: ${DB_PWD:Root.123456} # password: ${DB_PWD:Root.123456}
password: ${DB_PWD:123456} password: ${DB_PWD:123456}

8
nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -44,7 +44,7 @@ https://juejin.cn/post/6844903775631572999
<!--日志文件保留天数--> <!--日志文件保留天数-->
<maxHistory>15</maxHistory> <maxHistory>15</maxHistory>
<!--单个日志最大容量 至少10MB才能看得出来--> <!--单个日志最大容量 至少10MB才能看得出来-->
<maxFileSize>50MB</maxFileSize> <maxFileSize>30MB</maxFileSize>
<!--所有日志最多占多大容量--> <!--所有日志最多占多大容量-->
<totalSizeCap>20GB</totalSizeCap> <totalSizeCap>20GB</totalSizeCap>
</rollingPolicy> </rollingPolicy>
@@ -74,13 +74,16 @@ https://juejin.cn/post/6844903775631572999
<root level="debug"> <root level="debug">
<appender-ref ref="asyncLuceneAppender"/> <appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="CONSOLE"/>
</root> </root>
<logger name="jdbc" level="ERROR" additivity="true"> <logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="org.springframework" level="ERROR" additivity="true"> <logger name="org.springframework" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="org.hibernate" level="ERROR" additivity="true"> <logger name="org.hibernate" level="ERROR" additivity="true">
@@ -97,6 +100,7 @@ https://juejin.cn/post/6844903775631572999
</logger> </logger>
<logger name="org.redisson" level="ERROR" additivity="true"> <logger name="org.redisson" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="org.nl.modules.wql" level="ERROR" additivity="true"> <logger name="org.nl.modules.wql" level="ERROR" additivity="true">
@@ -105,10 +109,12 @@ https://juejin.cn/post/6844903775631572999
</logger> </logger>
<logger name="org.springframework.data" level="ERROR" additivity="true"> <logger name="org.springframework.data" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="org.jinterop" level="ERROR" additivity="true"> <logger name="org.jinterop" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
</springProfile> </springProfile>