Merge remote-tracking branch 'origin/master'

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

@@ -590,8 +590,8 @@ public class TaskWorkNode {
                                  }
                              }
                         }
-
-                        log.setExeResult("0").setManual("0").setFeedback("设备资源和条件判断不通过");
+                        String msg = retJson.containsKey("data") && StringUtils.isNotEmpty(retJson.getString("data"))? retJson.getString("data") : "设备资源和条件判断不通过";
+                        log.setExeResult("0").setManual("0").setFeedback(msg);
                         taskNodeService.freeLock(taskNode.getCompleteBatchNo());
                         logger.warn("{}设备资源不通过释放节点", taskNode.getCompleteBatchNo());
                     }

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

@@ -305,8 +305,8 @@ public class AAutoNodeLogServiceImpl extends SuperServiceImpl<AAutoNodeLogMapper
     @Override
     public AAutoNodeLog confirmCallback() {
         LbqWrapper<AAutoNodeLog> lbqWrapper = new LbqWrapper<AAutoNodeLog>();
-        lbqWrapper.eq(AAutoNodeLog::getExeStatus, "2").isNotNull(AAutoNodeLog::getTaskNodeId).isNotNull(AAutoNodeLog::getRequestParameter)
-                .lt(AAutoNodeLog::getStartTime, DateUtil.getAddSecondsTime(new Date(), TIMEOUT_THRESHOLD_SEC)).orderByDesc(AAutoNodeLog::getCreateTime);
+        lbqWrapper.eq(AAutoNodeLog::getExeStatus, "2").isNotNull(AAutoNodeLog::getTaskNodeId).isNotNull(AAutoNodeLog::getRequestParameter).eq(AAutoNodeLog::getSendStatus, "1")
+                .gt(AAutoNodeLog::getEndTime, DateUtil.getAddSecondsTime(new Date(), TIMEOUT_THRESHOLD_SEC)).orderByDesc(AAutoNodeLog::getCreateTime);
         List<AAutoNodeLog> robotLogList = aAutoNodeLogService.list(lbqWrapper);
 
         Optional<AAutoNodeLog> aAutoNodeLog = robotLogList.stream().filter(item->{