fix(业务模块): 新增业务历史上链接口

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

@@ -216,6 +216,13 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
     @Override
     public void historyUpperChain() {
         //历史数据 循环查询数据上链
+        List<AllotBackBill> all = allotBackBillDao.findAll();
+        log.info("[配发退回业务]开始上链");
+        if (all.size() >0){
+            all.forEach(allotBackBill -> sendText(allotBackBill.getId()));
+        }
+        log.info("[配发退回业务]结束上链");
+        log.info("[配发退回业务]共上链:{}条",all.size());
     }
 
     /**

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

@@ -36,6 +36,7 @@ import com.tykj.dev.misc.exception.ApiException;
 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.aspectj.util.FileUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,7 @@ import java.util.stream.Collectors;
  * @author dengdiyi
  */
 @Service
+@Slf4j
 public class AllotBillServiceImpl implements AllotBillService {
 
     @Autowired
@@ -288,6 +290,13 @@ public class AllotBillServiceImpl implements AllotBillService {
     @Override
     public void historyUpperChain() {
         //历史数据 循环查询数据上链
+        List<AllotBill> all = allotBillDao.findAll();
+        log.info("[配发业务]开始上链");
+        if (all.size() >0){
+            all.forEach(allotBill -> sendText(allotBill.getId()));
+        }
+        log.info("[配发业务]结束上链");
+        log.info("[配发业务]共上链:{}条",all.size());
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
+import com.tykj.dev.device.allot.subject.domin.AllotBackBill;
 import com.tykj.dev.device.apply.repository.DeviceApplyBillDao;
 import com.tykj.dev.device.apply.service.DeviceApplyBillService;
 import com.tykj.dev.device.apply.subject.domin.DeviceApplyBill;
@@ -363,7 +364,14 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
 
     @Override
     public void historyUpperChain() {
-
+        //历史数据 循环查询数据上链
+        List<DeviceApplyBill> all = deviceApplyBillDao.findAll();
+        log.info("[申请业务]开始上链");
+        if (all.size() >0){
+            all.forEach(deviceApplyBill -> sendText(deviceApplyBill.getId()));
+        }
+        log.info("[申请业务]结束上链");
+        log.info("[申请业务]共上链:{}条",all.size());
     }
 
     private String operatorName(DeviceApplyBill deviceApplyBill) {

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

@@ -42,4 +42,9 @@ public interface RepairBackBillService extends RepairPublicService<RepairBackBil
      * @return 溯源信息实体
      */
     BlockTraceabilityParsing traceabilityParsing(Integer billId);
+
+    /**
+     * 历史数据上链
+     */
+    void historyUpperChain();
 }

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

@@ -57,5 +57,9 @@ public interface RepairSendBillService {
      */
     BlockTraceabilityParsing traceabilityParsing(Integer billId);
 
+    /**
+     * 历史数据上链
+     */
+    void historyUpperChain();
 
 }

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

@@ -215,6 +215,18 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
         return blockTraceabilityParsing;
     }
 
+    @Override
+    public void historyUpperChain() {
+        //历史数据 循环查询数据上链
+        List<RepairBackBill> all = deviceRepairBackBillDao.findAll();
+        log.info("[维修退回业务]开始上链");
+        if (all.size() >0){
+            all.forEach(repairBackBill -> sendText(repairBackBill.getId()));
+        }
+        log.info("[维修退回业务]结束上链");
+        log.info("[维修退回业务]共上链:{}条",all.size());
+    }
+
     /**
      * 文本上链接口
      * @param billId 业务id

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

@@ -209,6 +209,18 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
         return blockTraceabilityParsing;
     }
 
+    @Override
+    public void historyUpperChain() {
+        //历史数据 循环查询数据上链
+        List<RepairSendBill> all = deviceRepairSendBillDao.findAll();
+        log.info("[送修业务]开始上链");
+        if (all.size() >0){
+            all.forEach(repairSendBill -> sendText(repairSendBill.getId()));
+        }
+        log.info("[送修业务]结束上链");
+        log.info("[送修业务]共上链:{}条",all.size());
+    }
+
     /**
      * 文本上链接口
      * @param billId 业务id

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/service/impl/SelfCheckBillServiceImpl.java

@@ -478,6 +478,13 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
     @Override
     public void historyUpperChain() {
         //历史数据 循环查询数据上链
+        List<SelfCheckBill> all = selfExaminationBillDao.findAll();
+        log.info("[自查业务]开始上链");
+        if (all.size() >0){
+            all.forEach(selfCheckBill -> sendText(selfCheckBill.getId()));
+        }
+        log.info("[自查业务]结束上链");
+        log.info("[自查业务]共上链:{}条",all.size());
     }
 
     /**

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

@@ -46,4 +46,9 @@ public interface StorageBillService {
      * @return 溯源信息实体
      */
     BlockTraceabilityParsing traceabilityParsing(Integer billId);
+
+    /**
+     * 历史数据上链
+     */
+    void historyUpperChain();
 }

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

@@ -195,6 +195,18 @@ public class StorageBillServiceImpl implements StorageBillService {
         return blockTraceabilityParsing;
     }
 
+    @Override
+    public void historyUpperChain() {
+        //历史数据 循环查询数据上链
+        List<StorageBill> all = storageBillDao.findAll();
+        log.info("[入库业务]开始上链");
+        if (all.size() >0){
+            all.forEach(storageBill -> sendText(storageBill.getId()));
+        }
+        log.info("[入库业务]结束上链");
+        log.info("[入库业务]共上链:{}条",all.size());
+    }
+
     /**
      * 文本上链接口
      * @param billId 业务id

dev-union/src/main/java/com/tykj/dev/union/RunController.java

@@ -9,6 +9,9 @@ package com.tykj.dev.union;
  */
 
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.allot.service.AllotBackBillService;
+import com.tykj.dev.device.allot.service.AllotBillService;
+import com.tykj.dev.device.apply.service.DeviceApplyBillService;
 import com.tykj.dev.device.block.service.BlockService;
 import com.tykj.dev.device.confirmcheck.service.HistoryCheckDeviceService;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
@@ -19,8 +22,13 @@ import com.tykj.dev.device.loss.service.DeviceLossService;
 import com.tykj.dev.device.matching.service.MatchingDeviceBillService;
 import com.tykj.dev.device.matching.service.MatchingDeviceLibraryService;
 import com.tykj.dev.device.matching.subject.vo.MatchingUnitVo;
+import com.tykj.dev.device.repair.service.RepairBackBillService;
+import com.tykj.dev.device.repair.service.RepairBillService;
+import com.tykj.dev.device.repair.service.RepairSendBillService;
 import com.tykj.dev.device.scrap.service.ScrapService;
+import com.tykj.dev.device.selfcheck.service.SelfCheckBillService;
 import com.tykj.dev.device.sendback.service.DeviceRepelDetailService;
+import com.tykj.dev.device.storage.service.StorageBillService;
 import com.tykj.dev.device.user.cache.UnitsCache;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.entity.Area;
@@ -87,6 +95,27 @@ public class RunController {
     @Autowired
     private HistoryCheckDeviceService historyCheckDeviceService;
 
+    @Resource
+    private AllotBillService allocBillService;
+
+    @Resource
+    private AllotBackBillService allotBackBillService;
+
+    @Resource
+    private DeviceApplyBillService deviceApplyBillService;
+
+    @Resource
+    private RepairSendBillService repairSendBillService;
+
+    @Resource
+    private RepairBackBillService repairBackBillService;
+
+    @Resource
+    private SelfCheckBillService selfCheckBillService;
+
+    @Resource
+    private StorageBillService storageBillService;
+
 
     @ApiOperation(value = "修正核查的历史装备数据")
     @GetMapping("/device/check/device/his")
@@ -168,4 +197,25 @@ public class RunController {
 
     }
 
+
+    @ApiOperation(value = "业务历史循环上链", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock() {
+        //配发
+        allocBillService.historyUpperChain();
+        //退回
+        allotBackBillService.historyUpperChain();
+        //申请
+        deviceApplyBillService.historyUpperChain();
+        //维修
+        repairSendBillService.historyUpperChain();
+        //维修退回
+        repairBackBillService.historyUpperChain();
+        //自查
+        selfCheckBillService.historyUpperChain();
+        //入库
+        storageBillService.historyUpperChain();
+    }
+
 }