fix(区块链模块): 修复配发，退回，入库问题

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java

@@ -103,7 +103,8 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
     public AllotBackBill update(AllotBackBill allotBackBill) {
         AllotBackBill allotBackBill1 = allotBackBillDao.save(allotBackBill);
         //根据recordId追加上链
-        CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(allotBackBill),allotBackBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
+//        CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(allotBackBill),allotBackBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
+        sendText(allotBackBill1.getId());
         return allotBackBill1;
     }
 

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java

@@ -110,7 +110,8 @@ public class AllotBillServiceImpl implements AllotBillService {
         //save
         AllotBill allotBill = allotBillDao.save(allotBillEntity);
         //根据recordId追加上链
-        CompletableFuture.runAsync(() -> blockChainUtil.appendHash(JacksonUtil.toJSon(allotBill), allotBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
+//        CompletableFuture.runAsync(() -> blockChainUtil.appendHash(JacksonUtil.toJSon(allotBill), allotBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
+        sendText(allotBill.getId());
         return allotBill;
     }
 

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

@@ -35,8 +35,8 @@ public class TraceabilityParsingData {
     private String operatorUserName;
 
     @ApiModelProperty(value = "操作时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDateTime operationTime;
 
     @ApiModelProperty(value = "相关载体id")

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

@@ -20,6 +20,20 @@ public class DateUtil {
 
     }
 
+    /**
+     * 只需要年月日
+     * @param date
+     * @return
+     */
+    public static LocalDateTime getLocalDateTimeNoSecond(Date date){
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String strdate = format.format(date);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return LocalDateTime.parse(strdate, formatter);
+
+    }
+
     public static LocalDate getLocalDate(Date date){
         Instant instant = date.toInstant();
         ZoneId zoneId = ZoneId.of("GMT+8");

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

@@ -23,6 +23,8 @@ import com.tykj.dev.device.storage.service.StorageBillService;
 import com.tykj.dev.device.storage.subject.domin.StorageBill;
 import com.tykj.dev.device.storage.subject.vo.StorageBillDetail;
 import com.tykj.dev.device.task.service.TaskService;
+import com.tykj.dev.device.user.cache.UserCache;
+import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.BlockBusinessEnum;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.utils.DateUtil;
@@ -65,6 +67,10 @@ public class StorageBillServiceImpl implements StorageBillService {
 
     @Resource
     private Executor taskExecutor;
+
+    @Resource
+    private UserCache userCache;
+
     @Override
     public StorageBill addEntity(StorageBill storageBillEntity) {
         StorageBill storageBill = storageBillDao.save(storageBillEntity);
@@ -168,7 +174,7 @@ public class StorageBillServiceImpl implements StorageBillService {
         traceabilityParsingData.setCarrierIds(getSeqNumber(storageBill));
         traceabilityParsingData.setInitiateUnitName(storageBill.getSendUnit());
         traceabilityParsingData.setReceiveUnitName("浙江省机要局");
-        traceabilityParsingData.setOperationTime(DateUtil.getLocalDateTime(storageBill.getSendTime()));
+        traceabilityParsingData.setOperationTime(DateUtil.getLocalDateTimeNoSecond(storageBill.getSendTime()));
         traceabilityParsingData.setOperatorUserName(operatorName(storageBill));
         blockTraceabilityParsing.setBusinessTraceabilityParsingData(traceabilityParsingData);
 
@@ -181,7 +187,7 @@ public class StorageBillServiceImpl implements StorageBillService {
         traceabilityParsingData1.setCarrierIds(getSeqNumber(storageBill1));
         traceabilityParsingData1.setInitiateUnitName(storageBill1.getSendUnit());
         traceabilityParsingData1.setReceiveUnitName("浙江省机要局");
-        traceabilityParsingData1.setOperationTime(DateUtil.getLocalDateTime(storageBill1.getSendTime()));
+        traceabilityParsingData1.setOperationTime(DateUtil.getLocalDateTimeNoSecond(storageBill1.getSendTime()));
         traceabilityParsingData1.setOperatorUserName(operatorName(storageBill1));
         blockTraceabilityParsing.setBlockTraceabilityParsingData(traceabilityParsingData1);
         blockTraceabilityParsing.setBlockData(storageBill1);
@@ -209,9 +215,9 @@ public class StorageBillServiceImpl implements StorageBillService {
         StringBuffer buf = new StringBuffer();
         buf.append(storageBill.getSendUserId())
                 .append(",")
-                .append(storageBill.getReceiveUserA())
+                .append(userCache.findById(storageBill.getReceiveUseraId()).getName())
                 .append(",")
-                .append(storageBill.getReceiveUserB());
+                .append(userCache.findById(storageBill.getReceiveUserbId()).getName());
         return buf.toString();
 
     }

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.147:8088
 carrier.url = http://192.168.0.101:8087/configuration/saveConfiguration
 
 file.matching.excel=/Users/zhoushaopan/excel/