diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ConveyorServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ConveyorServiceImpl.java index f98fdca..5c65f76 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ConveyorServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ConveyorServiceImpl.java @@ -30,17 +30,14 @@ public class ConveyorServiceImpl implements ConveyorService { } String url = paramService.findByCode(AcsConfig.CONVEYOR_URL).getValue(); try { - /* String body = HttpRequest + String body = HttpRequest .post(url) .setConnectionTimeout(10000) .body(JSON.toJSONString(json)) .execute() .body(); log.info("applyPutAndGet - 返回参数 {}", body); - return JSON.parseObject(body);*/ - JSONObject result = new JSONObject(); - result.put("action", "1"); - return JSON.parseObject(result.toString()); + return JSON.parseObject(body); } catch (Exception e) { throw new BadRequestException(e.getMessage()); } diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 78d9a5e..9ec4929 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -638,7 +638,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code() + "INGET"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code() + "INGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -668,7 +668,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code() + "OUTGET"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code() + "OUTGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -699,7 +699,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code() + "INPUT"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code() + "INPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -726,7 +726,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code() + "OUTPUT"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code() + "OUTPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -758,7 +758,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2() + "INGET"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code2() + "INGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -788,7 +788,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getStart_point_code2() + "OUTGET"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getStart_point_code2() + "OUTGET"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -821,7 +821,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code2() + "INPUT"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code2() + "INPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -848,7 +848,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { block = new JSONObject(); block.put("blockId", IdUtil.simpleUUID()); block.put("location", inst.getNext_point_code2() + "OUTPUT"); - block.put("operation", "script"); + block.put("operation", "ForkHeight"); block.put("id", inst.getNext_point_code2() + "OUTPUT"); block.put("script_name", "userpy/interact.py"); JSONObject scriptArgs = new JSONObject(); @@ -946,7 +946,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { //目的地名称 jo.put("location", inst.getStart_point_code() + "INGET"); //执行脚本 - jo.put("operation", "script"); + jo.put("operation", "ForkHeight"); jo.put("id", inst.getStart_point_code() + "INGET"); //通信脚本,动作前后与现场设备交互的场景 jo.put("script_name", "userpy/interact.py"); @@ -983,7 +983,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject jo2 = new JSONObject(); jo2.put("blockId", IdUtil.simpleUUID()); jo2.put("location", inst.getStart_point_code() + "OUTGET"); - jo2.put("operation", "script"); + jo2.put("operation", "ForkHeight"); jo2.put("id", inst.getStart_point_code() + "OUTGET"); jo2.put("script_name", "userpy/interact.py"); JSONObject script_args2 = new JSONObject(); @@ -1007,7 +1007,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject jo3 = new JSONObject(); jo3.put("blockId", IdUtil.simpleUUID()); jo3.put("location", inst.getNext_point_code() + "INPUT"); - jo3.put("operation", "script"); + jo3.put("operation", "ForkHeight"); jo3.put("id", inst.getNext_point_code() + "INPUT"); jo3.put("script_name", "userpy/interact.py"); JSONObject script_args3 = new JSONObject(); @@ -1042,7 +1042,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { JSONObject jo5 = new JSONObject(); jo5.put("blockId", IdUtil.simpleUUID()); jo5.put("location", inst.getNext_point_code() + "OUTPUT"); - jo5.put("operation", "script"); + jo5.put("operation", "ForkHeight"); jo5.put("id", inst.getNext_point_code() + "OUTPUT"); jo5.put("script_name", "userpy/interact.py"); JSONObject script_args5 = new JSONObject();