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

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

@@ -32,6 +32,7 @@ import com.tykj.dev.misc.base.BlockBusinessEnum;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,7 @@ import static java.util.stream.Collectors.groupingBy;
  * @author dengdiyi
  */
 @Service
+@Slf4j
 public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
 
     @Autowired
@@ -86,6 +88,7 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
     public DeviceApplyBill addEntity(DeviceApplyBill deviceApplyBillEntity) {
         DeviceApplyBill deviceApplyBill = deviceApplyBillDao.save(deviceApplyBillEntity);
         sendText(deviceApplyBill.getId());
+        log.info("新增[申请]上链");
         return deviceApplyBill;
     }
 
@@ -106,7 +109,9 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
     @Override
     public DeviceApplyBill update(DeviceApplyBill deviceApplyBillEntity) {
         DeviceApplyBill deviceApplyBill = deviceApplyBillDao.save(deviceApplyBillEntity);
-        CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(deviceApplyBill),deviceApplyBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
+        sendText(deviceApplyBill.getId());
+        log.info("更新[申请]上链");
+//        CompletableFuture.runAsync(()->blockChainUtil.appendHash(JacksonUtil.toJSon(deviceApplyBill),deviceApplyBill.getRecordId()),TaskBeanConfig.getThreadPoolTaskScheduler());
         return deviceApplyBill;
     }
 
@@ -365,9 +370,11 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
 
         StringBuffer buf = new StringBuffer();
         buf.append(deviceApplyBill.getApplyUser())
-                .append(",")
-                .append(deviceApplyBill.getAgent());
-
+                .append(",");
+        String agent = deviceApplyBill.getAgent();
+        if (agent != null){
+            buf.append(agent);
+        }
         return buf.toString();
 
     }

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

@@ -25,6 +25,7 @@ import com.tykj.dev.device.repair.subject.domin.RepairBill;
 import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
 import com.tykj.dev.device.repair.subject.vo.RepairBillSelectVo;
 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;
@@ -82,6 +83,9 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
     @Resource
     private RepairBillService repairBillService;
 
+    @Resource
+    private UserCache userCache;
+
     @Override
     public RepairBackBill save(RepairBackBill deviceRepairBackBillEntity) {
         RepairBackBill repairBackBill = deviceRepairBackBillDao.save(deviceRepairBackBillEntity);
@@ -227,13 +231,13 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
     private String operatorName(RepairBackBill repairBackBill) {
 
         StringBuffer buf = new StringBuffer();
-        buf.append(repairBackBill.getStartUserA())
+        buf.append(userCache.findById(repairBackBill.getStartUseraId()).getName())
                 .append(",")
-                .append(repairBackBill.getStartUserB())
+                .append(userCache.findById(repairBackBill.getStartUserbId()).getName())
                 .append(",")
-                .append(repairBackBill.getReceiveUserA())
+                .append(userCache.findById(repairBackBill.getReceiveUseraId()).getName())
                 .append(",")
-                .append(repairBackBill.getReceiveUserB());
+                .append(userCache.findById(repairBackBill.getReceiveUserbId()).getName());
         return buf.toString();
 
     }

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

@@ -174,7 +174,7 @@ public class StorageBillServiceImpl implements StorageBillService {
         traceabilityParsingData.setCarrierIds(getSeqNumber(storageBill));
         traceabilityParsingData.setInitiateUnitName(storageBill.getSendUnit());
         traceabilityParsingData.setReceiveUnitName("浙江省机要局");
-        traceabilityParsingData.setOperationTime(DateUtil.getLocalDateTimeNoSecond(storageBill.getSendTime()));
+        traceabilityParsingData.setOperationTime(DateUtil.getLocalDateTime(storageBill.getSendTime()));
         traceabilityParsingData.setOperatorUserName(operatorName(storageBill));
         blockTraceabilityParsing.setBusinessTraceabilityParsingData(traceabilityParsingData);
 
@@ -187,7 +187,7 @@ public class StorageBillServiceImpl implements StorageBillService {
         traceabilityParsingData1.setCarrierIds(getSeqNumber(storageBill1));
         traceabilityParsingData1.setInitiateUnitName(storageBill1.getSendUnit());
         traceabilityParsingData1.setReceiveUnitName("浙江省机要局");
-        traceabilityParsingData1.setOperationTime(DateUtil.getLocalDateTimeNoSecond(storageBill1.getSendTime()));
+        traceabilityParsingData1.setOperationTime(DateUtil.getLocalDateTime(storageBill1.getSendTime()));
         traceabilityParsingData1.setOperatorUserName(operatorName(storageBill1));
         blockTraceabilityParsing.setBlockTraceabilityParsingData(traceabilityParsingData1);
         blockTraceabilityParsing.setBlockData(storageBill1);