上链信息接口提交

dev-block/src/main/java/com/tykj/dev/device/block/run/BlockRun.java

@@ -21,10 +21,10 @@ public class BlockRun implements CommandLineRunner {
     BlockService blockService;
     @Override
     public void run(String... args) throws Exception {
-//        log.info("添加区块业务类型开始");
-//        for (BlockBusinessEnum value : BlockBusinessEnum.values()) {
-//                blockService.subRegister(value.name);
-//        }
-//        log.info("添加区块业务类型结束");
+        log.info("添加区块业务类型开始");
+        for (BlockBusinessEnum value : BlockBusinessEnum.values()) {
+                blockService.subRegister(value.name);
+        }
+        log.info("添加区块业务类型结束");
     }
 }

dev-block/src/main/java/com/tykj/dev/device/block/service/impl/BlockDataServiceImpl.java

@@ -57,7 +57,15 @@ public class BlockDataServiceImpl implements BlockDataService {
         }else {
             TraceabilityParsingData businessTraceabilityParsingData =blockTraceabilityParsing.getBusinessTraceabilityParsingData();
             TraceabilityParsingData blockTraceabilityParsingData = blockTraceabilityParsing.getBlockTraceabilityParsingData();
-            return businessTraceabilityParsingData.equals(blockTraceabilityParsingData);
+            boolean equals1 = businessTraceabilityParsingData.equals(blockTraceabilityParsingData);
+            businessTraceabilityParsingData.setOperationTime(businessTraceabilityParsingData.getOperationTime().plusSeconds(1));
+            boolean equals2 = businessTraceabilityParsingData.equals(blockTraceabilityParsingData);
+            businessTraceabilityParsingData.setOperationTime(businessTraceabilityParsingData.getOperationTime().minusSeconds(2));
+            boolean equals3 = businessTraceabilityParsingData.equals(blockTraceabilityParsingData);
+
+
+
+            return equals1 || equals2 || equals3;
         }
     }