rev:代码优化

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@@ -265,7 +265,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
                 (byte) 0X00, (byte) 0X6D,
                 (byte) 0X00, (byte) 0X06,
                 (byte) indexhigh, (byte) indexlow,
-                (byte) 0X01, (byte) 0X10,
+                (byte) 0X01, (byte) 0X12,
                 (byte) phasehigh, (byte) phaselow
         };
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java

@@ -198,7 +198,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 inst.setAgv_jobno(String.valueOf(index));
                                 inst.setSend_status("1");
                                 instructionService.update(inst);
-                                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                             }
                             flag = true;
                         }
@@ -225,14 +225,15 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
+                                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                             }
-                            data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
                         }
                         //请求删除任务
                         //(需要WCS反馈)
                         else if (phase == 0x30) {
-//                        data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0);
+                            if (!ObjectUtil.isEmpty(inst)) {
-                            data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0, 0, 0);
+                                data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0);
+                            }
                         }
                         //任务删除确认
                         //(需要WCS反馈)
@@ -241,8 +242,8 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 log.info("未找到指令号{}对应的指令", ikey);
                             } else {
                                 instructionService.cancelNOSendAgv(inst.getInstruction_id());
+                                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                             }
-                            data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                         } else if (phase == 0x50) {
                             if (ObjectUtil.isEmpty(device_code)) {
                                 log.info(agvaddr + "对应设备号为空!");

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java

@@ -212,28 +212,16 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
 
             if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
                 standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
-                //放货确认
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
-                if (standardOrdinarySiteDeviceDriver.getOption() == 1) {
+                LuceneLogDto logDto = LuceneLogDto.builder()
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                        .device_code(this.getDeviceCode())
-                    LuceneLogDto logDto = LuceneLogDto.builder()
+                        .content("agvphase:" + phase + "反馈:" + data)
-                            .device_code(this.getDeviceCode())
+                        .build();
-                            .content("agvphase:" + phase + "反馈:" + data)
+                logDto.setLog_level(4);
-                            .build();
+                luceneExecuteLogService.deviceExecuteLog(logDto);
-                    logDto.setLog_level(4);
+                standardOrdinarySiteDeviceDriver.setOption(0);
-                    luceneExecuteLogService.deviceExecuteLog(logDto);
-                    standardOrdinarySiteDeviceDriver.setOption(0);
-                } else {
-                    log.info("等待一体机进行放货确认，设备号{},option值{}", standardOrdinarySiteDeviceDriver.getDevice_code(), standardOrdinarySiteDeviceDriver.getOption());
-                    logServer.deviceExecuteLog(this.device_code, "", "", "等待一体机进行放货确认,设备号" + device.getDevice_code() + ",指令号" + ikey);
-                    LuceneLogDto logDto = LuceneLogDto.builder()
-                            .device_code(standardOrdinarySiteDeviceDriver.getDevice_code())
-                            .content("等待一体机进行放货确认,设备号" + standardOrdinarySiteDeviceDriver.getDevice_code() + ",option当前值" + standardOrdinarySiteDeviceDriver.getOption())
-                            .build();
-                    logDto.setLog_level(4);
-                    luceneExecuteLogService.deviceExecuteLog(logDto);
-                }
             } else {
-                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                 LuceneLogDto logDto = LuceneLogDto.builder()
                         .device_code(this.getDeviceCode())
                         .content("agvphase:" + phase + "反馈:" + data)
@@ -295,7 +283,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
 
             if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
                 standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
-                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                 LuceneLogDto logDto = LuceneLogDto.builder()
                         .device_code(this.getDeviceCode())
                         .content("agvphase:" + phase + "反馈:" + data)
@@ -306,7 +294,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                 standardOrdinarySiteDeviceDriver.setIndex(index);
                 standardOrdinarySiteDeviceDriver.setInst(inst);
             } else {
-                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                 LuceneLogDto logDto = LuceneLogDto.builder()
                         .device_code(this.getDeviceCode())
                         .content("agvphase:" + phase + "反馈:" + data)
@@ -357,9 +345,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
             }
             if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
                 standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
-                //卸货确认
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
-                if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
-                    data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
                     LuceneLogDto logDto = LuceneLogDto.builder()
                             .device_code(this.getDeviceCode())
                             .content("agvphase:" + phase + "反馈:" + data)
@@ -367,19 +353,9 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                     logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
                     standardOrdinarySiteDeviceDriver.setOption(0);
-                } else {
-                    log.info("等待一体机进行卸货确认，设备号{},option值{}", standardOrdinarySiteDeviceDriver.getDevice_code(), standardOrdinarySiteDeviceDriver.getOption());
-                    logServer.deviceExecuteLog(this.device_code, "", "", "等待一体机进行卸货确认,设备号" + device.getDevice_code() + ",指令号" + ikey);
-                    LuceneLogDto logDto = LuceneLogDto.builder()
-                            .device_code(standardOrdinarySiteDeviceDriver.getDevice_code())
-                            .content("等待一体机进行卸货确认,设备号" + standardOrdinarySiteDeviceDriver.getDevice_code() + ",option当前值" + standardOrdinarySiteDeviceDriver.getOption())
-                            .build();
-                    logDto.setLog_level(4);
-                    luceneExecuteLogService.deviceExecuteLog(logDto);
-                }
 
             } else {
-                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                 LuceneLogDto logDto = LuceneLogDto.builder()
                         .device_code(this.getDeviceCode())
                         .content("agvphase:" + phase + "反馈:" + data)
@@ -431,7 +407,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
             }
             if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
                 standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
-                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                 LuceneLogDto logDto = LuceneLogDto.builder()
                         .device_code(this.getDeviceCode())
                         .content("agvphase:" + phase + "反馈:" + data)
@@ -442,7 +418,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                 standardOrdinarySiteDeviceDriver.setIndex(index);
                 standardOrdinarySiteDeviceDriver.setInst(inst);
             } else {
-                data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
+                data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
                 LuceneLogDto logDto = LuceneLogDto.builder()
                         .device_code(this.getDeviceCode())
                         .content("agvphase:" + phase + "反馈:" + data)

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

@@ -421,8 +421,8 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             dto.setIs_send(task.getLink_num());
         }
 
-
+        //ndc只接受itype=1
-        dto.setInstruction_type("3");
+        dto.setInstruction_type("1");
 
         // 起点设备与终点设备相同则为初始指令
         if (StrUtil.equals(task.getStart_device_code(), dto.getStart_device_code())) {
@@ -470,29 +470,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                 throw new BadRequestException(LangProcess.msg("error_isNull", "route"));
             }
             if (shortPathsList.size() > 0 && StrUtil.equals(shortPathsList.get(0).getType(), CommonFinalParam.ONE)) {
-                // 0为输送、立库任务  1 1楼叉车系统  2 2楼1区域AGV系统 3 2楼2区域AGV系统
+
-                if (StrUtil.isBlank(dto.getAgv_inst_type())) {
-                    String task_type = task.getTask_type();
-                    // task_type
-                    //1、生箔； Itype=1:取空，取满，放空，放满；
-                    //2、分切  Itype=3取满、取空、放满、放空；
-                    //3、普通任务 Itype=2:取货、放货；
-                    //4、叉车任务
-                    //5、输送任务
-                    //6、行架
-                    //7、立库
-                    if (StrUtil.equals(task_type, "1")) {
-                        dto.setAgv_inst_type("1");
-                    } else if (StrUtil.equals(task_type, "3")) {
-                        dto.setAgv_inst_type("2");
-                    } else if (StrUtil.equals(task_type, "2")) {
-                        dto.setAgv_inst_type("3");
-                    } else if (StrUtil.equals(task_type, "8")) {
-                        dto.setAgv_inst_type("2");
-                    } else {
-                        log.info("未找到对应的AGV指令类型，任务号:" + task.getTask_code() + ",task_type:" + task.getTask_type());
-                    }
-                }
                 NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
                 log.warn("下发AGV指令数据," + "指令号:" + dto.getInstruction_code() + ",AGV系统类型:" + dto.getAgv_system_type()
                         + ",AGV指令类型:" + dto.getInstruction_type());

acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java

@@ -161,30 +161,7 @@ public class AutoCreateInst {
             instdto.setStart_height(start_height);
             instdto.setNext_height(next_height);
             instdto.setAgv_action_type(agvActionType);
-            //判断agv系统
+
-            //1、1楼叉车系统
-            //2、2楼1区域AGV系统
-            //3、2楼2区域AGV系统 -已废弃
-            // task_type
-            //1、生箔； Itype=1:取空，取满，放空，放满；
-            //2、分切  Itype=3取满、取空、放满、放空；
-            //3、普通任务 Itype=2:取货、放货；
-            //4、叉车任务
-            //5、输送任务
-            //6、行架
-            //7、立库
-            if (StrUtil.equals(task_type, CommonFinalParam.ONE)) {
-                instdto.setAgv_inst_type(CommonFinalParam.ONE);
-            } else if (StrUtil.equals(task_type, "3")) {
-                instdto.setAgv_inst_type("2");
-            } else if (StrUtil.equals(task_type, "2")) {
-                instdto.setAgv_inst_type("3");
-            } else if (StrUtil.equals(task_type, "8")) {
-                instdto.setAgv_inst_type("2");
-            } else {
-                log.info("未找到对应的AGV指令类型，任务号:" + acsTask.getTask_code() + ",task_type:" + acsTask.getTask_type());
-                continue;
-            }
             try {
                 instructionService.create(instdto);
             } catch (Exception e) {