feat(装备申请模块，装备配发模块.装备退回,装备维修，装备自查，装备使用报告): 新增单位id字段

dev-statistical/src/main/java/com/tykj/dev/statistical/cache/BigScreenCacheConfig.java

@@ -17,9 +17,13 @@ public class BigScreenCacheConfig {
     @Autowired
     private BigScreenService bigScreenService;
 
+//    @Bean
+//    public BigScreenCache initBigScreenCache(){
+//        return new BigScreenCache(bigScreenService.getAllDeviceNum(),bigScreenService.getBusinessNum(2),bigScreenService.getCenterNum(),bigScreenService.getRepairNum(),bigScreenService.getRepairDevices(),bigScreenService.getSelfCheckNum(),bigScreenService.selectUserDataScreen());
+//    }
     @Bean
     public BigScreenCache initBigScreenCache(){
-        return new BigScreenCache(bigScreenService.getAllDeviceNum(),bigScreenService.getBusinessNum(2),bigScreenService.getCenterNum(),bigScreenService.getRepairNum(),bigScreenService.getRepairDevices(),bigScreenService.getSelfCheckNum(),bigScreenService.selectUserDataScreen());
+        return new BigScreenCache();
     }
 
 }

dev-statistical/src/main/java/com/tykj/dev/statistical/cache/CacheConfig.java

@@ -2,9 +2,14 @@ package com.tykj.dev.statistical.cache;
 
 import com.tykj.dev.statistical.service.BigScreenService;
 import com.tykj.dev.statistical.service.StatisticalService;
+import jdk.nashorn.tools.Shell;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
 
@@ -12,21 +17,28 @@ import java.text.ParseException;
  * @author dengdiyi
  * 统计分析缓存配置类
  */
-@Configuration
+//@Configuration
+@Component
+@Order(value = 10)
 public class CacheConfig {
 
     @Autowired
     private StatisticalService statisticalService;
 
-
+//    @Bean
+//    public StatisticalCache initStatisticalCache() throws ParseException, InterruptedException {
+//
+//        return new StatisticalCache(statisticalService.getDeviceNum(), statisticalService.getLifeStatus(1),
+//                statisticalService.getLifeStatus(2), statisticalService.getSelfCheck(), statisticalService.getYearSelfCheck(),
+//                statisticalService.getRfidWarning(), statisticalService.getRfidWarningDetail(1),
+//                statisticalService.getRfidWarningDetail(2), statisticalService.getCheckNum(),
+//                statisticalService.getConfirmCheck(1), statisticalService.getConfirmCheck(2),
+//                statisticalService.getUserGeneralSituation(), statisticalService.getSelfCheckStat());
+//    }
     @Bean
-    public StatisticalCache initStatisticalCache() throws ParseException {
-        return new StatisticalCache(statisticalService.getDeviceNum(),statisticalService.getLifeStatus(1),
-                statisticalService.getLifeStatus(2),statisticalService.getSelfCheck(),statisticalService.getYearSelfCheck(),
-                statisticalService.getRfidWarning(),statisticalService.getRfidWarningDetail(1),
-                statisticalService.getRfidWarningDetail(2),statisticalService.getCheckNum(),
-                statisticalService.getConfirmCheck(1),statisticalService.getConfirmCheck(2),
-                statisticalService.getUserGeneralSituation(),statisticalService.getSelfCheckStat());
+    public StatisticalCache initStatisticalCache() throws ParseException, InterruptedException {
+
+        return new StatisticalCache();
     }
 
 }

dev-statistical/src/main/java/com/tykj/dev/statistical/cache/CacheRefreshTask.java

@@ -16,6 +16,7 @@ import com.tykj.dev.statistical.service.StatisticalService;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.stereotype.Component;

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

@@ -21,6 +21,8 @@ import com.tykj.dev.device.usereport.subject.domin.DeviceUseReport;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.Collections;
@@ -28,6 +30,7 @@ import java.util.List;
 
 @Slf4j
 @Component
+@Order(value = 1)
 public class DataInit implements CommandLineRunner {
 
     @Resource
@@ -194,6 +197,7 @@ public class DataInit implements CommandLineRunner {
     }
 
     @Override
+    @Order(100)
     public void run(String... args) throws Exception {
         log.info("单位名称初始化-----");
         initCheckDetailUnitName();