控制台显示空指针问题修改

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

@@ -237,7 +237,7 @@ public class TaskWorkNode {
 
 //        logger.info("==================请求地址=============" + autoProgramUrl);
         String returnData = "";
-        Map conMap = null;
+        Map conMap = new HashMap();
         try {
             if ("04".equals(taskNode.getInterfaceType())) {
                 //人工上下料或质检
@@ -275,11 +275,6 @@ public class TaskWorkNode {
                 //运行条件验证
                 conMap = checkCon(taskNode, tTask, queryMap);
 
-                // 当三次校验不通过时返回是空
-                if (null == conMap) {
-                    throw new RuntimeException("执行超时或执行设备状态异常");
-                }
-
                 msgUtil.redis_set_map(CacheKey.TASK_CURRENT_NODE_CONDITION + "_" + taskNode.getId(), conMap);
                 if((boolean)conMap.get("result")){
                     if ("03".equals(taskNode.getInterfaceType())) {
@@ -512,7 +507,7 @@ public class TaskWorkNode {
         }else{
             repeatCheckOnCount = Integer.valueOf(repeatCount.toString()) + 1;
         }
-        if(repeatCheckOnCount > 3){
+        if(repeatCheckOnCount > 1){
             Map conMap = new HashMap();
             conMap.put("result",false);
             msgUtil.redis_del("repeatCheckOnCount"+taskNode.getId());