接口参数修改

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

@@ -417,8 +417,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
 
                         //满足条件--机器人空闲，设备或线边库有一个空闲
                         Map locationMap = new HashMap();
-                        locationMap.put("location",targetStorge);
-                        dataMap.put("Data", locationMap);
+                        locationMap.put("location",targetStorge.getPointId());
+                        dataMap.put("data", locationMap);
                         dataMap.put("method", "MoveRobotPosition");
                     }
                     dataMap.put("result", po);
@@ -429,8 +429,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put("fromStorge", currentStore);
 
                     Map locationMap = new HashMap();
-                    locationMap.put("location",currentStore);
-                    dataMap.put("Data", locationMap);
+                    locationMap.put("location",currentStore.getPointId());
+                    dataMap.put("data", locationMap);
                     //出入库类型
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
                     //目的地为机器人手臂
@@ -446,8 +446,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     Storge hcwStorge = (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
 
                     Map locationMap = new HashMap();
-                    locationMap.put("location",hcwStorge);
-                    dataMap.put("Data", locationMap);
+                    locationMap.put("location",hcwStorge.getPointId());
+                    dataMap.put("data", locationMap);
 
                     dataMap.put("toStorge", hcwStorge);
                     dataMap.put("result", true);
@@ -469,8 +469,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put("fromStorge", startStore);
 
                     Map locationMap = new HashMap();
-                    locationMap.put("location",targetStorge);
-                    dataMap.put("Data", locationMap);
+                    locationMap.put("location",targetStorge.getPointId());
+                    dataMap.put("data", locationMap);
                     // TODO 有问题，需要区分是否是第一步上料
                     //出入库类型
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
@@ -499,15 +499,15 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 dataMap.put("result", po!=null);
             }
         }else if ("放".equals(functionName)) {
-            Object targetStorge = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId());
+            Storge targetStorge = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId())==null?null:(Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId());
             //执行到第几步
             dataMap.put(taskNode.getId().toString()+"count",count);
             if(BizConstant.ROBOT_TYPE_CACHE.equals(zoneService.getRobotTypebyZone(zoneName))){
                 dataMap.put(YunjianConstant.YUNJIAN_XBK_CACHE_FLAG, "1");
                 if(count==0) {
                     Map locationMap = new HashMap();
-                    locationMap.put("location",targetStorge);
-                    dataMap.put("Data", locationMap);
+                    locationMap.put("location",targetStorge.getPointId());
+                    dataMap.put("data", locationMap);
 
 
                     dataMap.put("method", "MoveRobotPosition");
@@ -516,8 +516,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     Storge hcwStorge = (Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
 
                     Map locationMap = new HashMap();
-                    locationMap.put("location",hcwStorge);
-                    dataMap.put("Data", locationMap);
+                    locationMap.put("location",hcwStorge.getPointId());
+                    dataMap.put("data", locationMap);
 
                     dataMap.put("fromStorge", hcwStorge);
                     Storge handStorge = (Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNode.getId());
@@ -530,8 +530,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE,DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
 
                     Map locationMap = new HashMap();
-                    locationMap.put("location",targetStorge);
-                    dataMap.put("Data", locationMap);
+                    locationMap.put("location",targetStorge.getPointId());
+                    dataMap.put("data", locationMap);
 
                     dataMap.put("toStorge", targetStorge);
 
@@ -549,8 +549,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 dataMap.put("toStorge", targetStorge);
 
                 Map locationMap = new HashMap();
-                locationMap.put("location",targetStorge);
-                dataMap.put("Data", locationMap);
+                locationMap.put("location",targetStorge.getPointId());
+                dataMap.put("data", locationMap);
 
                 dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE,DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
                 String targetxbk =(String)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + taskNode.getId());