临时测试

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -322,7 +322,8 @@ public class TaskWorkNode {
         //调试得时候打开
         jsonObject.put("code", "1");
         logger.info("节点请求参数" + jsonObject.toJSONString());
-        //msgUtil.redis_set("testParam", jsonObject.toJSONString(), 1, TimeUnit.DAYS);
+        //临时先把请求参数放出来
+        msgUtil.redis_set("testParam", jsonObject.toJSONString(), 1, TimeUnit.DAYS);
         return jsonObject.toJSONString();
     }
 
@@ -423,7 +424,7 @@ public class TaskWorkNode {
         nodeOperationService.initResource(taskNode, task, map);
 
         if (bizType.equals(BizConstant.MQ_TASK_NODE_TYPE_COMMON))  {//正常节点类型
-            BomProcedureProductionresource bomProcedureProductionresource = bomProcedureProductionresourceService.getOne(new QueryWrapper<BomProcedureProductionresource>().eq("resourceId",task.getResourceId()).eq("procedureId", task.getProcedureId()));
+//            BomProcedureProductionresource bomProcedureProductionresource = bomProcedureProductionresourceService.getOne(new QueryWrapper<BomProcedureProductionresource>().eq("resourceId",task.getResourceId()).eq("procedureId", task.getProcedureId()));
             //List<ResourceAutoCode>  resourceAutoCodeList = resourceAutoCodeService.getNodeList(resourceAutoCode);
             //业务序列节点
             //ResourceAutoCode parentAutoCode = resourceAutoCodeService.getById(resourceAutoCode.getParentId());

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

@@ -156,8 +156,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
     @Override
     public Map checkCondition(TaskNode taskNode, TTask task, Map<String, Object> dataMap) {
         //具体的搬运类型
-        String carryType = dataMap.get("carryType") == null ? "" : dataMap.get("carryType").toString();
-        String robotType = dataMap.get("robotType") == null ? "" : dataMap.get("robotType").toString();
+//        String robotType = dataMap.get("robotType") == null ? "" : dataMap.get("robotType").toString();
 
         //Map<String, Object> map = new HashMap<>();
         map.put("taskNode", taskNode);
@@ -341,7 +340,6 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 //执行到第几步
                 dataMap.put(taskNode.getId().toString() + "count", count);
                 dataMap.put(YunjianConstant.YUNJIAN_XBK_CACHE_FLAG, "1");
-                dataMap.put("zkIp", ZK_ip_rxx);
 
                 if (count == 0) {//第一步的时候锁定资源
                     //判断机器人是否为空

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/classSchedule/ScheduleFrequencyController.java

@@ -63,8 +63,17 @@ public class ScheduleFrequencyController extends SuperController<ScheduleFrequen
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
+    private String url = "http://localhost:9099/api/authority/taskNode/taskNodeCallback";
+
     @Override
     public void query(PageParams<ScheduleFrequencyPageDTO> params, IPage<ScheduleFrequency> page, Long defSize) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
+        String jsonParam = redisTemplate.opsForValue().get("testParam").toString();
+        HttpEntity<String> formEntity = new HttpEntity<String>(jsonParam,headers);
+        //调用接口
+        String returnData = restTemplate.postForObject(url, formEntity, String.class);
+
         ScheduleFrequencyPageDTO data = params.getModel();
         QueryWrap<ScheduleFrequency> wrap = handlerWrapper(null, params);
         LbqWrapper<ScheduleFrequency> wrapper = wrap.lambda();

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/UrlConfConstant.java

@@ -26,7 +26,10 @@ public interface UrlConfConstant {
         /**
          * 上位机模拟程序接口
          */
-        public String plcURL = "http://106.15.38.8:8090";
+        public String plcURL = "http://127.0.0.1:8764/task/testTask";
+
+
+//        public String plcURL = "http://106.15.38.8:8090";
 
         /**
          * 保障平台