合并dev

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

@@ -58,10 +58,16 @@ public class BlockDataServiceImpl implements BlockDataService {
             TraceabilityParsingData businessTraceabilityParsingData =blockTraceabilityParsing.getBusinessTraceabilityParsingData();
             TraceabilityParsingData blockTraceabilityParsingData = blockTraceabilityParsing.getBlockTraceabilityParsingData();
             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);
+            boolean equals2=false;
+            boolean equals3=false;
+            if (businessTraceabilityParsingData.getOperationTime()!=null) {
+                businessTraceabilityParsingData.setOperationTime(businessTraceabilityParsingData.getOperationTime().plusSeconds(1));
+                equals2 = businessTraceabilityParsingData.equals(blockTraceabilityParsingData);
+                businessTraceabilityParsingData.setOperationTime(businessTraceabilityParsingData.getOperationTime().minusSeconds(2));
+                equals3 = businessTraceabilityParsingData.equals(blockTraceabilityParsingData);
+            }
+
+
 
 
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/task/CheckTimedTask.java

@@ -29,6 +29,7 @@ public class CheckTimedTask {
         try {
             checkBlockService.detailToChain();
             run = false;
+
         } catch (Exception e) {
             log.error("[check] 上链是啊比:{}", e.toString());
             run = false;

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java

@@ -242,7 +242,7 @@ public class ScrapServiceImpl implements ScrapService {
      */
     public void sendText(Integer id){
         Scrap scrap = queryScrap(id);
-        blockService.sendText(BlockBusinessEnum.SCRAP.subCode, JSON.toJSONStringWithDateFormat(scrap,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteDateUseDateFormat), BusinessEnum.DESTROY.id,id,scrap.getSendUnit());
+        blockService.sendText(BlockBusinessEnum.SCRAP.subCode, JSON.toJSONStringWithDateFormat(scrap,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteDateUseDateFormat), BusinessEnum.SCRAP.id,id,scrap.getSendUnit());
     }
 
     private Scrap queryScrap(Integer scrapId){

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -1087,6 +1087,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
         deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
         deviceRepelDetail.setRepelStatus(2);
+        deviceRepelDetail.setSendTime(new Date());
         taskService.moveToEnd(taskBto);
         DeviceRepel deviceRepel = deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
         if (storageDeviceRepel.getDeviceIds() != null && storageDeviceRepel.getDeviceIds().size() != 0) {

dev-union/src/main/resources/application-dev.properties

@@ -21,8 +21,8 @@ block.flag=true
 readMachine.ip=192.168.101.201
 qrcode.path = /Users/zjm/code/test-tu/
 qrcode.preview.path=http://192.168.102.121:8087/code/
-block.carrier.ip=http://192.168.0.30:8088
+block.carrier.ip=http://localhost:8088
 carrier.url = http://192.168.0.101:8087/configuration/saveConfiguration
 
 file.matching.excel=/Users/zhoushaopan/excel/
-check.time.last=/Users/zjm/code/test-tu/check
\ No newline at end of file
+check.time.last=C:/file/CHECKTIME.txt
\ No newline at end of file