放设备后台bug修复

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

@@ -1299,14 +1299,14 @@ public class TaskWorkNode {
                 dataMap.put("data", locationMap);
 
                 String uploadInfo = msgUtil.redis_get(DemoLineConstant.DEMOLINE_HEIDENHAIN_FILE_URL+"_"+task.getId())!=null? msgUtil.redis_get(DemoLineConstant.DEMOLINE_HEIDENHAIN_FILE_URL+"_"+task.getId()).toString(): null;
-                Productionresource productionresource =  productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
+                Productionresource productionresource =  taskNode.getTargetResourceId()!=null? productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId())) : null;
                 TTask tTask = taskMapper.selectById(taskNode.getTaskId());
                 Order currentOrder = orderMapper.selectById(tTask.getOrderId());
                 if(StringUtils.isNotEmpty(uploadInfo)){
                     JSONObject jsonObject  = JSONObject.parseObject(uploadInfo);
                     //异步发送哈默预处理编号
                     this.asyncPost(jsonObject);
-                }else if("1".equals(currentOrder.getSingleTaskFlag()) && "HEIDENHAIN".equals(productionresource.getModeSpecification()) && ObjectUtil.isNotEmpty(productionresource)){
+                }else if("1".equals(currentOrder.getSingleTaskFlag()) && productionresource!=null && "HEIDENHAIN".equals(productionresource.getModeSpecification()) && ObjectUtil.isNotEmpty(productionresource)){
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("url", productionresource.getIp());
                     jsonObject.put("port", productionresource.getPort());

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

@@ -845,12 +845,12 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                         Storge hcwStorge = (Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
 
                         String uploadInfo = msgUtil.redis_get(DemoLineConstant.DEMOLINE_HEIDENHAIN_FILE_URL+"_"+task.getId())!=null? msgUtil.redis_get(DemoLineConstant.DEMOLINE_HEIDENHAIN_FILE_URL+"_"+task.getId()).toString(): null;
-                        Productionresource productionresource =  productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
+                        Productionresource productionresource =  taskNode.getTargetResourceId()!=null ? productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId())) : null;
                         if(StringUtils.isNotEmpty(uploadInfo)){
                             JSONObject jsonObject  = JSONObject.parseObject(uploadInfo);
                             //异步发送哈默预处理编号
                             boolean bool = this.asyncPost(jsonObject);
-                        }else if("1".equals(currentOrder.getSingleTaskFlag()) && "HEIDENHAIN".equals(productionresource.getModeSpecification()) && ObjectUtil.isNotEmpty(productionresource)){
+                        }else if("1".equals(currentOrder.getSingleTaskFlag()) && productionresource!=null && "HEIDENHAIN".equals(productionresource.getModeSpecification()) && ObjectUtil.isNotEmpty(productionresource)){
                                 JSONObject jsonObject = new JSONObject();
                                 jsonObject.put("url", productionresource.getIp());
                                 jsonObject.put("port", productionresource.getPort());