feat(区块链模块): 提交区块链相关接口

dev-apply/src/main/java/com/tykj/dev/device/apply/service/impl/DeviceApplyBillServiceImpl.java

@@ -388,6 +388,7 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
      */
     public void sendText(Integer id){
         DeviceApplyBill deviceApplyBill = queryDeviceApplyBill(id);
+
         blockService.sendText(BlockBusinessEnum.APPLY.subCode, JacksonUtil.toJSon(deviceApplyBill), BusinessEnum.APPLY.id,id,deviceApplyBill.getApplyUnit());
     }
 

dev-block/src/main/java/com/tykj/dev/device/block/entity/vo/TraceabilityParsingData.java

@@ -64,4 +64,10 @@ public class TraceabilityParsingData {
     @ApiModelProperty(value = "批复文号")
     private String replayNumber;
 
+    @ApiModelProperty(value = "发件单位签章id")
+    private String leftSignatureId;
+
+    @ApiModelProperty(value = "收件单位签章id")
+    private String rightSignatureId;
+
 }

dev-misc/src/main/java/com/tykj/dev/misc/base/BlockBusinessEnum.java

@@ -15,92 +15,92 @@ public enum BlockBusinessEnum {
     /**
      * 入库业务
      */
-    STORAGE(1019, "入库业务"),
+    STORAGE(1023, "入库业务"),
     /**
      * 配发业务
      */
-    ALLOT(1020, "配发业务"),
+    ALLOT(1024, "配发业务"),
     /**
      * 自查业务
      */
-    SELF_CHECK(1021, "自查业务"),
+    SELF_CHECK(1025, "自查业务"),
     /**
      * 维修业务
      */
-    REPAIR(1022, "维修业务"),
+    REPAIR(1026, "维修业务"),
     /**
      * 核查业务
      */
-    CONFIRM_CHECK(1023, "核查业务"),
+    CONFIRM_CHECK(1027, "核查业务"),
     /**
      * 核查统计业务
      */
-    CONFIRM_CHECK_STAT(1024, "核查统计"),
+    CONFIRM_CHECK_STAT(1028, "核查统计"),
     /**
      * 核查详情业务
      */
-    CONFIRM_CHECK_DETAIL(1025, "核查详情"),
+    CONFIRM_CHECK_DETAIL(1029, "核查详情"),
     /**
      * 申请业务
      */
-    APPLY(1026, "申请业务"),
+    APPLY(1030, "申请业务"),
     /**
      * 维修退回
      */
-    REPAIR_BACK(1027, "维修退回"),
+    REPAIR_BACK(1031, "维修退回"),
     /**
      * 维修继续送修
      */
-    REPAIR_SEND(1028, "维修继续送修"),
+    REPAIR_SEND(1032, "维修继续送修"),
 
     /**
      * 销毁业务
      */
-    DESTROY(1029, "销毁业务"),
+    DESTROY(1033, "销毁业务"),
 
     /**
      * 清退业务
      */
-    SEND_BACK(1030, "清退业务"),
+    SEND_BACK(1034, "清退业务"),
     /**
      * 清退异常处理
      */
-    DECOMMISSIONING(1031, "退役业务"),
+    DECOMMISSIONING(1035, "退役业务"),
 
     /**
      * 新增配套设备
      */
-    ADD_MATCHING_DEVICE(1032, "新增配套设备"),
+    ADD_MATCHING_DEVICE(1036, "新增配套设备"),
 
     /**
      * 工作交接
      */
-    WORK_HANDOVER(1033, "交接"),
+    WORK_HANDOVER(1037, "交接"),
     /**
      * 退回
      */
-    ALLOT_BACK(1034, "退回业务"),
+    ALLOT_BACK(1038, "退回业务"),
     /**
      * 报废
      */
-    SCRAP(1035, "报废业务"),
+    SCRAP(1039, "报废业务"),
 
     /**
      * 丢失
      */
-    LOSS(1036,"丢失业务"),
+    LOSS(1040,"丢失业务"),
 
     /**
      * 找回
      */
-    RETRIEVE(1037,"找回业务"),
+    RETRIEVE(1041,"找回业务"),
 
     /**
      * 重新入库
      */
-    AGAINSTORAGE(1038,"装备状态转换业务"),
+    AGAINSTORAGE(1042,"装备状态转换业务"),
 
-    TRAIN(1039,"培训业务");
+    TRAIN(1043,"培训业务");
 
     public Integer subCode;
 

dev-misc/src/main/java/com/tykj/dev/misc/utils/DateUtil.java

 package com.tykj.dev.misc.utils;
 
+import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
@@ -11,8 +12,12 @@ import java.util.Date;
 public class DateUtil {
 
     public static LocalDateTime getLocalDateTime(Date date){
-        Instant instant = date.toInstant();
-        return instant.atZone(ZoneOffset.of("+8")).toLocalDateTime();
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String strdate = format.format(date);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(strdate, formatter);
+
     }
 
     public static LocalDate getLocalDate(Date date){

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -1249,6 +1249,14 @@ public class PackingController {
         return ResponseEntity.ok(map);
     }
 
+    @ApiOperation(value = "根据列装ID集合查询详情")
+    @PostMapping("/findAllIds")
+    public ResponseEntity findAllIds(@RequestBody List<Integer> ids){
+        List<PackingLibrary> byIds = packingLibraryService.findByIds(ids);
+        byIds.forEach(PackingLibrary::setConfigName);
+        return ResponseEntity.ok(byIds);
+    }
+
     /**
      * 设置排序
      * @param sortNum 数字

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -33,6 +33,7 @@ import com.tykj.dev.misc.utils.DateUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -58,6 +59,7 @@ import java.util.stream.Collectors;
  * @createTime 2020年08月25日 10:36:00
  */
 @Service
+@Slf4j
 public class RepairBackBillServiceImpl implements RepairBackBillService {
     @Autowired
     RepairBackBillDao deviceRepairBackBillDao;
@@ -83,7 +85,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
     @Override
     public RepairBackBill save(RepairBackBill deviceRepairBackBillEntity) {
         RepairBackBill repairBackBill = deviceRepairBackBillDao.save(deviceRepairBackBillEntity);
-        CompletableFuture.runAsync(()->{
+//        CompletableFuture.runAsync(()->{
 //            try {
 //                Thread.sleep(2000);
 //            } catch (InterruptedException e) {
@@ -94,8 +96,9 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
 //            String recordId = bcText.getData().getRecordID();
 //            repairBackBill1.setRecordId(recordId);
 //            deviceRepairBackBillDao.save(repairBackBill1);
-            sendText(repairBackBill.getId());
-        });
+//        });
+        sendText(repairBackBill.getId());
+
         return repairBackBill;
     }
 
@@ -113,9 +116,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
     public RepairBackBill update(RepairBackBill deviceRepairBackBillEntity) {
         RepairBackBill repairBackBill = deviceRepairBackBillDao.save(deviceRepairBackBillEntity);
 //        CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(repairBackBill),repairBackBill.getRecordId()), TaskBeanConfig.getThreadPoolTaskScheduler());
-        CompletableFuture.runAsync(()->{
-            sendText(repairBackBill.getId());
-        });
+        sendText(repairBackBill.getId());
         return repairBackBill;
     }
 
@@ -168,12 +169,13 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
 
     @Override
     public BlockTraceabilityParsing traceabilityParsing(Integer billId) {
+//        Integer id = deviceRepairBackBillDao.findByDeviceRepairBillId(billId).getId();
         BlockData billTypeAndBillId = blockDataService.findBillTypeAndBillId(BusinessEnum.REPAIR_BACK.id, billId);
         BcRecord bcRecord = blockService.fetchRecord(BlockBusinessEnum.REPAIR_BACK.subCode, billTypeAndBillId.getRecordID());
         RepairBackBill repairBackBill = queryRepairBackBill(billId);
         RepairBackBill repairBackBill1 = JSON.parseObject(bcRecord.getData().getContent(), RepairBackBill.class);
         BlockTraceabilityParsing blockTraceabilityParsing = bcRecord.getData().toBlockTraceabilityParsing();
-        RepairBill repairBill = repairBillService.getOne(repairBackBill.getDeviceRepairBillId());
+//        RepairBill repairBill = repairBillService.getOne();
         blockTraceabilityParsing.setBusinessTraceabilityParsingData(TraceabilityParsingData.builder()
                 .billTypeName("维修退回") //业务名称
                 .applyNumber(repairBackBill.getApplyNumber()) //申请文号
@@ -182,11 +184,13 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
                 .carrierIds(StringSplitUtil.stringListToString(repairBackBill.getScripts().stream().map(ScriptSaveVo::getSeqNumber).collect(Collectors.toList())))//序列号信息
                 .initiateUnitName(repairBackBill.getSendUnit())//发起单位
                 .receiveUnitName(repairBackBill.getReceiveUnit())//接收单位
-                .documentNo(repairBill.getDocNum()) //单据号
+                .documentNo(repairBackBill.getDocNum()) //单据号
                 .operationTime(DateUtil.getLocalDateTime(repairBackBill.getSendTime()))//发起时间
                 .operatorUserName(operatorName(repairBackBill)) //相关人员
+                .leftSignatureId(repairBackBill.getLeftSignatureId())
+                .rightSignatureId(repairBackBill.getRightSignatureId())
                 .build());
-        RepairBill repairBill1 = repairBillService.getOne(repairBackBill1.getDeviceRepairBillId());
+//        RepairBill repairBill1 = repairBillService.getOne(repairBackBill1.getDeviceRepairBillId());
         blockTraceabilityParsing.setBlockTraceabilityParsingData(TraceabilityParsingData.builder()
                 .billTypeName("维修退回")
                 .applyNumber(repairBackBill1.getApplyNumber())
@@ -195,12 +199,14 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
                 .carrierIds(StringSplitUtil.stringListToString(repairBackBill1.getScripts().stream().map(ScriptSaveVo::getSeqNumber).collect(Collectors.toList())))
                 .initiateUnitName(repairBackBill1.getSendUnit())
                 .receiveUnitName(repairBackBill1.getReceiveUnit())
-                .documentNo(repairBill1.getDocNum())
+                .documentNo(repairBackBill1.getDocNum())
                 .operationTime(DateUtil.getLocalDateTime(repairBackBill1.getSendTime()))
                 .operatorUserName(operatorName(repairBackBill1))
+                .leftSignatureId(repairBackBill1.getLeftSignatureId())
+                .rightSignatureId(repairBackBill1.getRightSignatureId())
                 .build());
-        blockTraceabilityParsing.setBlockData(repairBackBill1);
-        blockTraceabilityParsing.setCurrentData(repairBackBill);
+        blockTraceabilityParsing.setBlockData(repairBackBill1.trans2Name());
+        blockTraceabilityParsing.setCurrentData(repairBackBill.trans2Name());
         return blockTraceabilityParsing;
     }
 
@@ -212,7 +218,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
         RepairBackBill repairBackBill = queryRepairBackBill(billId);
         // 区块业务状态码，上链json数据，业务类型，业务id，发起单位
         blockService.sendText(BlockBusinessEnum.REPAIR_BACK.subCode, JacksonUtil.toJSon(repairBackBill), BusinessEnum.REPAIR_BACK.id,billId,repairBackBill.getSendUnit());
-
+        log.info("[维修退回]上链成功");
     }
 
     /**
@@ -237,8 +243,10 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
         RepairBackBill repairBackBill = deviceRepairBackBillDao.findById(billId).get();
         repairBackBill.setSendFileList(FilesUtil.stringFileToList(repairBackBill.getSendFiles()));
         repairBackBill.setReceiveFileList(FilesUtil.stringFileToList(repairBackBill.getReceiveFiles()));
-        repairBackBill.setScripts(JacksonUtil.readValue(repairBackBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
-        }));
+        if (repairBackBill.getScriptJson() != null){
+            repairBackBill.setScripts(JacksonUtil.readValue(repairBackBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
+            }));
+        }
         return repairBackBill;
 
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairSendBillServiceImpl.java

@@ -30,6 +30,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.utils.DateUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -51,6 +52,7 @@ import java.util.stream.Collectors;
  * @author dengdiyi
  */
 @Service
+@Slf4j
 public class RepairSendBillServiceImpl implements RepairSendBillService {
 
     @Autowired
@@ -77,14 +79,15 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
     @Override
     public RepairSendBill addEntity(RepairSendBill deviceRepairSendBillEntity) {
         RepairSendBill repairSendBill = deviceRepairSendBillDao.save(deviceRepairSendBillEntity);
-        CompletableFuture.runAsync(()->{
+//        CompletableFuture.runAsync(()->{
 //            RepairSendBill repairSendBill1 = getOne(repairSendBill.getId());
 //            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(repairSendBill1));
 //            String recordId = bcText.getData().getRecordID();
 //            repairSendBill1.setRecordId(recordId);
 //            deviceRepairSendBillDao.save(repairSendBill1);
-            sendText(repairSendBill.getId());
-        }, TaskBeanConfig.getThreadPoolTaskScheduler());
+//
+//        }, TaskBeanConfig.getThreadPoolTaskScheduler());
+        sendText(repairSendBill.getId());
         return repairSendBill;
     }
 
@@ -124,9 +127,10 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
     public RepairSendBill update(RepairSendBill deviceRepairSendBillEntity) {
         RepairSendBill repairSendBill = deviceRepairSendBillDao.save(deviceRepairSendBillEntity);
 //        CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(repairSendBill),deviceRepairSendBillEntity.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
-        CompletableFuture.runAsync(()->{
-            sendText(repairSendBill.getId());
-        }, TaskBeanConfig.getThreadPoolTaskScheduler());
+//        CompletableFuture.runAsync(()->{
+//
+//        }, TaskBeanConfig.getThreadPoolTaskScheduler());
+        sendText(repairSendBill.getId());
         return repairSendBill;
     }
 
@@ -160,9 +164,10 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
 
     @Override
     public BlockTraceabilityParsing traceabilityParsing(Integer billId) {
-        BlockData billTypeAndBillId = blockDataService.findBillTypeAndBillId(BusinessEnum.REPAIR.id, billId);
-        BcRecord bcRecord = blockService.fetchRecord(BlockBusinessEnum.ALLOT.subCode, billTypeAndBillId.getRecordID());
-        RepairSendBill repairSendBill = queryAllotBill(billId);
+        Integer id = findByRepairdId(billId).getId();
+        BlockData billTypeAndBillId = blockDataService.findBillTypeAndBillId(BusinessEnum.REPAIR.id, id);
+        BcRecord bcRecord = blockService.fetchRecord(BlockBusinessEnum.REPAIR.subCode, billTypeAndBillId.getRecordID());
+        RepairSendBill repairSendBill = queryAllotBill(id);
         RepairSendBill repairSendBill1 = JSON.parseObject(bcRecord.getData().getContent(), RepairSendBill.class);
         BlockTraceabilityParsing blockTraceabilityParsing = bcRecord.getData().toBlockTraceabilityParsing();
         RepairBill repairBill = repairBillService.getOne(repairSendBill.getDeviceRepairBillId());
@@ -177,6 +182,8 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
                 .documentNo(repairBill.getDocNum()) //单据号
                 .operationTime(DateUtil.getLocalDateTime(repairSendBill.getSendTime()))//发起时间
                 .operatorUserName(operatorName(repairSendBill)) //相关人员
+                .leftSignatureId(repairBill.getLeftSignatureId())
+                .rightSignatureId(repairBill.getRightSignatureId())
                 .build());
         RepairBill repairBill1 = repairBillService.getOne(repairSendBill1.getDeviceRepairBillId());
         blockTraceabilityParsing.setBlockTraceabilityParsingData(TraceabilityParsingData.builder()
@@ -190,9 +197,11 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
                 .documentNo(repairBill1.getDocNum())
                 .operationTime(DateUtil.getLocalDateTime(repairSendBill1.getSendTime()))
                 .operatorUserName(operatorName(repairSendBill1))
+                .leftSignatureId(repairBill1.getLeftSignatureId())
+                .rightSignatureId(repairBill1.getRightSignatureId())
                 .build());
-        blockTraceabilityParsing.setBlockData(repairSendBill1);
-        blockTraceabilityParsing.setCurrentData(repairSendBill);
+        blockTraceabilityParsing.setBlockData(repairSendBill1.trans2Name());
+        blockTraceabilityParsing.setCurrentData(repairSendBill.trans2Name());
         return blockTraceabilityParsing;
     }
 
@@ -203,8 +212,8 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
     private void sendText(Integer billId){
         RepairSendBill repairSendBill = queryAllotBill(billId);
         // 区块业务状态码，上链json数据，业务类型，业务id，发起单位
-        blockService.sendText(BlockBusinessEnum.ALLOT.subCode, JacksonUtil.toJSon(repairSendBill), BusinessEnum.REPAIR.id,billId,repairSendBill.getSendUnit());
-
+        blockService.sendText(BlockBusinessEnum.REPAIR.subCode, JacksonUtil.toJSon(repairSendBill), BusinessEnum.REPAIR.id,billId,repairSendBill.getSendUnit());
+        log.info("[维修]上链成功");
     }
 
     private RepairSendBill queryAllotBill(Integer billId){
@@ -212,8 +221,11 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
         RepairSendBill repairSendBill = deviceRepairSendBillDao.findById(billId).get();
         repairSendBill.setSendFileList(FilesUtil.stringFileToList(repairSendBill.getSendFiles()));
         repairSendBill.setReceiveFileList(FilesUtil.stringFileToList(repairSendBill.getReceiveFiles()));
-        repairSendBill.setScripts(JacksonUtil.readValue(repairSendBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
-        }));
+        if (repairSendBill.getScriptJson() != null ){
+            repairSendBill.setScripts(JacksonUtil.readValue(repairSendBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
+            }));
+        }
+
         return repairSendBill;
 
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairBackBill.java

@@ -3,6 +3,8 @@ package com.tykj.dev.device.repair.subject.domin;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
+import com.tykj.dev.device.user.cache.UserCache;
+import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -273,4 +275,23 @@ public class RepairBackBill {
     @ApiModelProperty(value = "装备集合")
     @Transient
     private List<DeviceLibrary> deviceLibraries;
+
+    public RepairBackBill trans2Name(){
+        UserCache initUserCache = SpringUtils.getBean("initUserCache");
+        if (initUserCache != null){
+            if (this.startUseraId != null){
+                this.setStartUserA(initUserCache.findById(this.startUseraId).getName());
+            }
+            if (this.startUserbId != null){
+                this.setStartUserB(initUserCache.findById(this.startUserbId).getName());
+            }
+            if (this.receiveUseraId != null){
+                this.setReceiveUserA(initUserCache.findById(this.receiveUseraId).getName());
+            }
+            if (this.receiveUserbId != null){
+                this.setReceiveUserB(initUserCache.findById(this.receiveUserbId).getName());
+            }
+        }
+        return this;
+    }
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairSendBill.java

@@ -3,6 +3,8 @@ package com.tykj.dev.device.repair.subject.domin;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
+import com.tykj.dev.device.user.cache.UserCache;
+import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -261,4 +263,23 @@ public class RepairSendBill {
     @ApiModelProperty(value = "装备集合")
     @Transient
     private List<DeviceLibrary> deviceLibraries;
+
+    public RepairSendBill trans2Name(){
+        UserCache initUserCache = SpringUtils.getBean("initUserCache");
+        if (initUserCache != null){
+            if (this.startUseraId != null){
+                this.setStartUserA(initUserCache.findById(this.startUseraId).getName());
+            }
+            if (this.startUserbId != null){
+                this.setStartUserB(initUserCache.findById(this.startUserbId).getName());
+            }
+            if (this.repairUseraId != null){
+                this.setRepairUserA(initUserCache.findById(this.repairUseraId).getName());
+            }
+            if (this.repairUserbId != null){
+                this.setRepairUserB(initUserCache.findById(this.repairUserbId).getName());
+            }
+        }
+        return this;
+    }
 }

dev-screen/src/main/java/com/tykj/dev/device/screen/subject/task/CheckScreenTask.java

@@ -56,15 +56,15 @@ public class CheckScreenTask {
     @Autowired
     RepelQueryService repelQueryService;
 
-    @Scheduled(cron = "0 * * * * ? ")
-    public void checkMap() {
-
-        long startTime = System.currentTimeMillis();
-        log.info("大屏自核查定时任务开始");
-        checkMapTask.initAll();
-        log.info("大屏自核查定时任务完成,用时:{}", System.currentTimeMillis() - startTime);
-
-    }
+//    @Scheduled(cron = "0 * * * * ? ")
+//    public void checkMap() {
+//
+//        long startTime = System.currentTimeMillis();
+//        log.info("大屏自核查定时任务开始");
+//        checkMapTask.initAll();
+//        log.info("大屏自核查定时任务完成,用时:{}", System.currentTimeMillis() - startTime);
+//
+//    }
 
     @Scheduled(cron = "0 00 23 31 12 ?")
     public void initDynamicData() {

dev-storage/src/main/java/com/tykj/dev/device/storage/service/impl/StorageBillServiceImpl.java

@@ -28,6 +28,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.utils.DateUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -37,12 +38,14 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 /**
  * @author dengdiyi
  */
 @Service
+@Slf4j
 public class StorageBillServiceImpl implements StorageBillService {
 
     @Autowired
@@ -59,6 +62,9 @@ public class StorageBillServiceImpl implements StorageBillService {
 
     @Resource
     private BlockService blockService;
+
+    @Resource
+    private Executor taskExecutor;
     @Override
     public StorageBill addEntity(StorageBill storageBillEntity) {
         StorageBill storageBill = storageBillDao.save(storageBillEntity);
@@ -74,7 +80,9 @@ public class StorageBillServiceImpl implements StorageBillService {
 //            storageBill1.setRecordId(recordId);
 //            storageBillDao.save(storageBill1);
 //        }, TaskBeanConfig.getThreadPoolTaskScheduler());
-        CompletableFuture.runAsync(()->sendText(storageBill.getId()));
+//        CompletableFuture.runAsync(()->sendText(storageBill.getId()),TaskBeanConfig.getThreadPoolTaskScheduler());
+//        taskExecutor.execute(()->sendText(storageBill.getId()));
+        sendText(storageBill.getId());
         return storageBill;
     }
 
@@ -166,17 +174,16 @@ public class StorageBillServiceImpl implements StorageBillService {
 
         StorageBill storageBill1 = JSON.parseObject(bcRecord.getData().getContent(), StorageBill.class);
         //区块链的数据
-        BlockTraceabilityParsing blockTraceabilityParsing1 = new BlockTraceabilityParsing();
         TraceabilityParsingData traceabilityParsingData1 = new TraceabilityParsingData();
-        traceabilityParsingData.setBillTypeName("入库");
-        traceabilityParsingData.setApplyNumber(storageBill1.getApplyNumber());
-        traceabilityParsingData.setReplayNumber(storageBill1.getReplayNumber());
-        traceabilityParsingData.setCarrierIds(getSeqNumber(storageBill1));
-        traceabilityParsingData.setInitiateUnitName(storageBill1.getSendUnit());
-        traceabilityParsingData.setReceiveUnitName("浙江省机要局");
-        traceabilityParsingData.setOperationTime(DateUtil.getLocalDateTime(storageBill1.getSendTime()));
-        traceabilityParsingData.setOperatorUserName(operatorName(storageBill1));
-        blockTraceabilityParsing1.setBlockTraceabilityParsingData(traceabilityParsingData1);
+        traceabilityParsingData1.setBillTypeName("入库");
+        traceabilityParsingData1.setApplyNumber(storageBill1.getApplyNumber());
+        traceabilityParsingData1.setReplayNumber(storageBill1.getReplayNumber());
+        traceabilityParsingData1.setCarrierIds(getSeqNumber(storageBill1));
+        traceabilityParsingData1.setInitiateUnitName(storageBill1.getSendUnit());
+        traceabilityParsingData1.setReceiveUnitName("浙江省机要局");
+        traceabilityParsingData1.setOperationTime(DateUtil.getLocalDateTime(storageBill1.getSendTime()));
+        traceabilityParsingData1.setOperatorUserName(operatorName(storageBill1));
+        blockTraceabilityParsing.setBlockTraceabilityParsingData(traceabilityParsingData1);
         blockTraceabilityParsing.setBlockData(storageBill1);
         blockTraceabilityParsing.setCurrentData(storageBill);
         return blockTraceabilityParsing;
@@ -188,8 +195,10 @@ public class StorageBillServiceImpl implements StorageBillService {
      */
     private void sendText(Integer billId){
         StorageBill storageBill = queryStorageBill(billId);
+        log.info("[入库业务]对象:{}",storageBill);
         // 区块业务状态码，上链json数据，业务类型，业务id，发起单位
-        blockService.sendText(BlockBusinessEnum.REPAIR_BACK.subCode, JacksonUtil.toJSon(storageBill), BusinessEnum.STORAGE.id,billId,storageBill.getSendUnit());
+        blockService.sendText(BlockBusinessEnum.STORAGE.subCode, JacksonUtil.toJSon(storageBill), BusinessEnum.STORAGE.id,billId,storageBill.getSendUnit());
+        log.info("[入库业务]上链成功");
     }
 
     /**

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

@@ -21,7 +21,7 @@ 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://localhost:8088
+block.carrier.ip=http://192.168.0.30:8088
 carrier.url = http://192.168.0.101:8087/configuration/saveConfiguration
 
 file.matching.excel=/Users/zhoushaopan/excel/