历史数据上联zjm

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -52,6 +52,7 @@ import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -77,6 +78,7 @@ import java.util.stream.Collectors;
 @AutoDocument
 @Api(tags = "专管员培训业务", description = "培训业务接口")
 @Slf4j
+@Service
 public class TrainJobController {
 
     @Autowired

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

@@ -29,6 +29,7 @@ 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.train.controller.TrainJobController;
 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;
@@ -116,6 +117,9 @@ public class RunController {
     @Resource
     private StorageBillService storageBillService;
 
+    @Autowired
+    TrainJobController trainJobController;
+
 
     @ApiOperation(value = "修正核查的历史装备数据")
     @GetMapping("/device/check/device/his")
@@ -172,11 +176,7 @@ public class RunController {
     @Transactional(rollbackFor = Exception.class)
     public void historyUpperChain() {
         log.info("[区块] 历史数据上链接口初始化");
-        scrapService.historyUpperChain();
-        deviceDestroyBillService.historyUpperChain();
-        deviceRepelDetailService.historyUpperChain();
-        deviceLossService.historyUpperChain();
-        deviceDecommissioningDetailService.historyUpperChain();
+
         log.info("[区块] 历史数据上链接口结束");
     }
 
@@ -198,6 +198,7 @@ public class RunController {
     }
 
 
+
     @ApiOperation(value = "业务历史循环上链", notes = "业务历史循环上链")
     @GetMapping("/bill/toBlock")
     @Transactional(rollbackFor = Exception.class)
@@ -216,6 +217,13 @@ public class RunController {
         selfCheckBillService.historyUpperChain();
         //入库
         storageBillService.historyUpperChain();
+
+        scrapService.historyUpperChain();
+        deviceDestroyBillService.historyUpperChain();
+        deviceRepelDetailService.historyUpperChain();
+        deviceLossService.historyUpperChain();
+        deviceDecommissioningDetailService.historyUpperChain();
+        trainJobController.historyUpperChain();
     }
 
 }