轨道车调度

mes/ktg-common/src/main/java/com/ktg/common/core/controller/BaseController.java

@@ -210,12 +210,6 @@ public class BaseController
             return null;
         }
         HttpServletRequest request = attributes.getRequest();
-        Enumeration<String> headerNames = request.getHeaderNames();
-        while (headerNames.hasMoreElements()){
-            String kName = headerNames.nextElement();
-            String val = request.getHeader(kName);
-            System.out.println(kName + "==" + val);
-        }
         return request.getHeader(key);
     }
 }

mes/ktg-mes/src/main/java/com/ktg/mes/rms/service/impl/RmsLineServiceImpl.java

@@ -1094,7 +1094,7 @@ public class RmsLineServiceImpl implements IRmsLineService {
 
         //轨道AGV
         if(Long.parseLong(flowTask.getDeviceType()) == DeviceTypeEnum.RAILAGV.getValue()){
-            rmsTaskPool.setDeviceType(DeviceTypeEnum.ROLLERAGV.getValue() + "");
+            rmsTaskPool.setDeviceType(DeviceTypeEnum.RAILAGV.getValue() + "");
             if(isLoad == 1){
                 if(StringUtils.isEmpty(fromSite)){
                     throw new Exception(flowTask.getFlowTaskId() + "AGV任务没有来源地");
@@ -1215,14 +1215,6 @@ public class RmsLineServiceImpl implements IRmsLineService {
         rmsTaskPool.setCreateTime(new Date());
         rmsTaskPool.setBeginTime(new Date());
         rmsTaskPool.setGroupCode(groupCode);
-//        int i = rmsTaskPoolMapper.insertRmsTaskPool(rmsTaskPool);
-//        if (i > 0) {
-//            if (rmsTaskPool.getParentId() == 0) {
-//                ApiCache.addRollerTask(rmsTaskPool);
-//            }
-//        } else {
-//            throw new Exception("接收平台任务新增失败");
-//        }
         return rmsTaskPool;
     }
 

mes/ktg-mes/src/main/java/com/ktg/mes/rms/task/ApiStockTask.java

@@ -231,6 +231,7 @@ public class ApiStockTask {
         }
     }
 
+    //轨道AGV任务
     public void railAgvTask(){
         if("net".equals(robotModel)||"mes".equals(robotModel)){
             return;
@@ -609,16 +610,30 @@ public class ApiStockTask {
         int isNext = 1;
         if(pool.isCheck() && pool.getTaskType().equals(fromType)){
             List<RmsTaskPool> rmsTaskPools = rmsTaskPoolService.queryFirstRunPool(pool);
-            RmsTaskPool taskPool = rmsTaskPools.stream().filter(item->item.getDeviceType().equals(DeviceTypeEnum.ROLLERAGV.getValue()+"")).findFirst().orElse(null);
-            if(taskPool != null){
-                boolean isConnRms = checkAgvServer(taskPool);
+            RmsTaskPool taskPoolAgv = rmsTaskPools.stream().filter(item->item.getDeviceType().equals(DeviceTypeEnum.ROLLERAGV.getValue()+"")).findFirst().orElse(null);
+            RmsTaskPool taskPoolRailAgv = rmsTaskPools.stream().filter(item->item.getDeviceType().equals(DeviceTypeEnum.ROLLERAGV.getValue()+"")).findFirst().orElse(null);
+            if(taskPoolRailAgv != null){
+                boolean isConnRms = checkAgvServer(taskPoolRailAgv);
+                if(!isConnRms){
+                    log.info("========轨道agv服务通讯失败===========");
+                    isNext = 2;
+                }else{
+                    rmsTaskPools.forEach(item->{
+                        if(item.getDeviceType().equals(DeviceTypeEnum.RAILAGV.getValue()+"")){
+                            item.setCheck(false);
+                            ApiCache.addRailAgvTask(item);
+                        }
+                    });
+                }
+            }
+            if(taskPoolAgv != null){
+                boolean isConnRms = checkAgvServer(taskPoolAgv);
                 if(!isConnRms){
                     log.info("========agv服务通讯失败===========");
                     isNext = 2;
                 }else{
                     rmsTaskPools.forEach(item->{
-                        if(item.getDeviceType().equals(DeviceTypeEnum.ROLLERAGV.getValue()+"")
-                            ||item.getDeviceType().equals(DeviceTypeEnum.RAILAGV.getValue()+"")){
+                        if(item.getDeviceType().equals(DeviceTypeEnum.ROLLERAGV.getValue()+"")){
                             item.setCheck(false);
                             ApiCache.addAgvTask(item);
                         }
@@ -1057,14 +1072,18 @@ public class ApiStockTask {
     public boolean checkAgvServer(RmsTaskPool rmsTaskPool) throws Exception {
         try {
             log.info("检查AGV服务器：" + rmsTaskPool.getDeviceType());
-//            if(String.valueOf(DeviceTypeEnum.ROLLERAGV.getValue()).equals(rmsTaskPool.getDeviceType())) {
-//                RmsHelper rmsHelper = RmsHelper.getInstance();
-//                rmsHelper.init();
-//            }
-//            if (String.valueOf(DeviceTypeEnum.RAILAGV.getValue()).equals(rmsTaskPool.getDeviceType())){
-//                RailHelper railHelper = RailHelper.getInstance();
-//                railHelper.init();
-//            }
+            if(String.valueOf(DeviceTypeEnum.ROLLERAGV.getValue()).equals(rmsTaskPool.getDeviceType())) {
+                RmsHelper rmsHelper = RmsHelper.getInstance();
+                rmsHelper.init();
+            }
+            if(String.valueOf(DeviceTypeEnum.ROLLERAGV.getValue()).equals(rmsTaskPool.getDeviceType())) {
+                RmsHelper rmsHelper = RmsHelper.getInstance();
+                rmsHelper.init();
+            }
+            if(String.valueOf(DeviceTypeEnum.RAILAGV.getValue()).equals(rmsTaskPool.getDeviceType())) {
+                RailHelper railHelper = RailHelper.getInstance();
+                railHelper.init();
+            }
             return true;
         }catch (Exception ex){
             log.error("RMS通讯异常：", ex);