临时测试

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/RobotNodeServiceImpl.java

@@ -171,7 +171,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         }
         String functionName = DictionaryKey.ROBOT_ACTION.get(resourceAutoCode.getCommand());
         //设备条件判断
-        String count = dataMap.get(taskNode.getId().toString() + "count") == null ? "0" : dataMap.get(taskNode.getId().toString() + "count").toString();
+//        String count = dataMap.get(taskNode.getId().toString() + "count") == null ? "0" : dataMap.get(taskNode.getId().toString() + "count").toString();
 //        ProductionresourcePosition productionresourcePosition = this.logical(robotList, count);
 
 //        boolean bool =  productionresourcePosition!=null ? true : false;
@@ -301,7 +301,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             case "柔性线机器人":
                 //操作柔性线边库 具有取、移动、放三种指令
                 //取放加工设备  设备存在缓存位
-                map = this.commandHandle(map, currStore, jqrStorge, functionName, count);
+                map = this.commandHandle(map, currStore, jqrStorge, functionName);
                 map.put("deviceUrl", ZK_ip_rxx);
                 break;
             case "智能单元机器人":
@@ -313,14 +313,14 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             case "舱体类加工单元":
                 //操作舱体线边库 具有取、移动、放三种指令
                 //取放加工设备
-                map = this.commandHandle(map, currStore, jqrStorge, functionName, count);
+                map = this.commandHandle(map, currStore, jqrStorge, functionName);
                 break;
             case "智能生产保障系统":
                 map = this.commandHandle(map, currStore, jqrStorge, functionName);
                 map.put("deviceUrl", ZK_ip_rxx);
                 break;
             case "框体类加工单元":
-                map = this.commandHandle(map, currStore, jqrStorge, functionName, count);
+                map = this.commandHandle(map, currStore, jqrStorge, functionName);
                 map.put("deviceUrl", ZK_ip_rxx);
                 break;
         }
@@ -348,13 +348,13 @@ public class RobotNodeServiceImpl implements NodeOperationService {
     }
 
     //机器人功能操作
-    private Map<String, Object>  commandHandle(Map<String, Object> dataMap, Storge startStore, Storge jqrStorge, String... params){
+    private Map<String, Object>  commandHandle(Map<String, Object> dataMap, Storge startStore, Storge jqrStorge, String functionName){
         TaskNode taskNode = (TaskNode) dataMap.get("taskNode");
         TTask task = (TTask) dataMap.get("task");
-        int count = Integer.parseInt(params[1]);
+        int count = Integer.parseInt(dataMap.get(taskNode.getId().toString() + "count") == null ? "0" : dataMap.get(taskNode.getId().toString() + "count").toString());
 
         //缓存位判断处理
-        if ("取".equals(params[0])) {
+        if ("取".equals(functionName)) {
             if(BizConstant.ROBOT_TYPE_CACHE.equals(zoneService.getRobotTypebyZone(zoneName))){
                 //执行到第几步
                 dataMap.put(taskNode.getId().toString() + "count", count);
@@ -465,7 +465,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put("result", true);
                 }
             }
-        }else if ("放".equals(params[0])) {
+        }else if ("放".equals(functionName)) {
             Object targetStorge = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId());
             //执行到第几步
             dataMap.put(taskNode.getId().toString()+"count",count);