Преглед на файлове

fix: 优化回调报错问题

wang.sq@aliyun.com преди 4 месеца
родител
ревизия
ba197dd0c4

+ 5 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/strategy/impl/CacheRobotStrategy.java

@@ -261,6 +261,11 @@ public class CacheRobotStrategy implements RobotStrategy {
                 msgUtil.redis_set(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId(), targetStorge, 10, TimeUnit.DAYS);
             } else {
                 //目标是线边库
+                Object xbkFlag = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_HCW_XBK_FLAG + taskNode.getId());
+                if(ObjectUtil.isNotEmpty(xbkFlag) && targetXbk.equals("1")){
+                    returnMap.put("result", false);
+                    return returnMap;
+                }
                 msgUtil.redis_set(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + taskNode.getId(), targetXbk, 10, TimeUnit.DAYS);
                 returnMap.put(YunjianConstant.YUNJIAN_XBKFLAG, "1");
                 returnMap.remove(taskNode.getId().toString()+"count");

+ 3 - 0
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AAutoNodeLog.java

@@ -270,6 +270,9 @@ public class AAutoNodeLog extends Entity<Long> {
     @TableField(exist = false)
     private String uniqueCode;
 
+    @TableField(exist = false)
+    private String completeBatchNo;
+
 
     /**
      * 设备分类