소스 검색

海康agv改成真实接口对接

yejian 2 년 전
부모
커밋
0a34cd04f0

+ 10 - 9
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/AgvHikOrderInfoServiceImpl.java

@@ -173,17 +173,18 @@ public class AgvHikOrderInfoServiceImpl extends SuperCacheServiceImpl<AgvHikOrde
 
         String agvCallbackUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(ParameterKey.AGVCALLBACKURL).toString());
 //        String agvCallbackUrl = parameterService.getValue(ParameterKey.AGVCALLBACKURL, null);
-        agvHikOrderDetailInfoService.asyncCallbackTask(jsonObject.toJSONString(),agvCallbackUrl);
-//        ResponseEntity<String> addAgvTaskEntity = restTemplate.postForEntity(addAgvTaskUrl, addAgvTaskRequest, String.class);
+        // 模拟回调
+//        agvHikOrderDetailInfoService.asyncCallbackTask(jsonObject.toJSONString(),agvCallbackUrl);
+        ResponseEntity<String> addAgvTaskEntity = restTemplate.postForEntity(addAgvTaskUrl, addAgvTaskRequest, String.class);
 
-//        String retData = addAgvTaskEntity.getBody();
+        String retData = addAgvTaskEntity.getBody();
 
-//        JSONObject returnData = JSONObject.parseObject(retData);
-        JSONObject returnData = new JSONObject();
-        returnData.put("code","0");
-        returnData.put("message","成功");
-        returnData.put("reqCode",reqCode);
-        returnData.put("data",taskCode);
+        JSONObject returnData = JSONObject.parseObject(retData);
+//        JSONObject returnData = new JSONObject();
+//        returnData.put("code","0");
+//        returnData.put("message","成功");
+//        returnData.put("reqCode",reqCode);
+//        returnData.put("data",taskCode);
 
         log.info("请求创建AGV运输任务返回{},请求参数{}",returnData,jsonObject.toString());