update...

panzhaov5
1 parent c1b0e05a
Showing 3 changed files with 55 additions and 35 deletions
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
@@ -115,8 +115,15 @@ public class OilRedisService implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        //启动加载油耗缓存
-        synchData(null);
+        Application.mainServices.schedule(new Runnable() {
+            @Override
+            public void run() {
+                //启动加载油耗缓存
+                synchData(null);
+            }
+        }, 30, TimeUnit.SECONDS);
+
+
         //定时刷新油耗信息
         Application.mainServices.scheduleWithFixedDelay(oilRefreshThread, 60 * 40, 60 * 40, TimeUnit.SECONDS);
     }
@@ -124,9 +131,9 @@ public class OilRedisService implements CommandLineRunner {
     /**
      * 和数据库同步数据
      */
-    public void synchData(Integer days){
+    public void synchData(Integer days) {
         int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
-        if(null != days && days < cacheDays)
+        if (null != days && days < cacheDays)
             cacheDays = days;
         //设置key 序列化器
         redisTemplate.setKeySerializer(new StringRedisSerializer());
@@ -144,6 +151,7 @@ public class OilRedisService implements CommandLineRunner {
         @Autowired
         OilRedisService oilRedisService;
+
         @Override
         public void run() {
             try {
@@ -124,16 +124,22 @@ public class PlanScheduleRedisService implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
-        //设置key 序列化器
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        Application.mainServices.schedule(new Runnable() {
+            @Override
+            public void run() {
+                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+                //设置key 序列化器
+                redisTemplate.setKeySerializer(new StringRedisSerializer());
+
+                DateTime dt = new DateTime();
+                dt = dt.minusDays(cacheDays);
+                dt = dt.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0).minusDays(cacheDays);
+                List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(dt.toDate(), new Date());
+                //写入redis
+                wirte(list);
+            }
+        }, 60 * 5, TimeUnit.SECONDS);
-        DateTime dt = new DateTime();
-        dt = dt.minusDays(cacheDays);
-        dt = dt.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0).minusDays(cacheDays);
-        List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(dt.toDate(), new Date());
-        //写入redis
-        wirte(list);
         //定时 00:05 分清理计划，并加载当天的计划
         long diff = (DateUtils.getTimestamp() + 1000 * 60 * 5) - System.currentTimeMillis();
@@ -158,6 +164,7 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         PlanScheduleRedisService planRedisService;
         @Autowired
         SchedulePlanInfoRepository planInfoRepository;
+
         @Override
         public void run() {
             try {
@@ -188,20 +188,26 @@ public class ScheduleRedisService implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
-        //设置key 序列化器
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        //用子线程去加载，，不要阻塞
+        Application.mainServices.schedule(new Runnable() {
+            @Override
+            public void run() {
+                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+                //设置key 序列化器
+                redisTemplate.setKeySerializer(new StringRedisSerializer());
-        DateTime dt = new DateTime();
-        dt = dt.minusDays(cacheDays);
-        List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDateLT(dt.toString("yyyy-MM-dd"));
-        calcTime(list);
-        //写入redis
-        wirte(list);
+                DateTime dt = new DateTime();
+                dt = dt.minusDays(cacheDays);
+                List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDateLT(dt.toString("yyyy-MM-dd"));
+                calcTime(list);
+                //写入redis
+                wirte(list);
+            }
+        }, 5, TimeUnit.SECONDS);
         //定时刷新一次当日实际排班
         int minute = 10;
-        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, minute, minute, TimeUnit.MINUTES);
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, minute + 4, minute, TimeUnit.MINUTES);
         //24小时清理一次实际排班数据
         Application.mainServices.scheduleWithFixedDelay(scheduleClearThread, 24, 24, TimeUnit.HOURS);
     }
@@ -275,12 +281,12 @@ public class ScheduleRedisService implements CommandLineRunner {
     private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm"),
             fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-    private void calcTime(List<ScheduleRealInfo> list){
-        if(list.size() == 0)
+    private void calcTime(List<ScheduleRealInfo> list) {
+        if (list.size() == 0)
             return;
         //计算真实执行日期 和 时间戳
-        for(ScheduleRealInfo sch : list){
+        for (ScheduleRealInfo sch : list) {
             calcRealDate(BasicData.lineStartTimeMap.get(sch.getXlBm()), sch);
         }
     }
@@ -291,10 +297,10 @@ public class ScheduleRedisService implements CommandLineRunner {
      */
     public void calcRealDate(String startTime, ScheduleRealInfo sch) {
         try {
-            if(null == startTime)
+            if (null == startTime)
                 return;
-            if(null == sch.getBcsj())
+            if (null == sch.getBcsj())
                 sch.setBcsj(0);
             String rq = sch.getScheduleDateStr();
@@ -303,27 +309,26 @@ public class ScheduleRedisService implements CommandLineRunner {
             //待发时间
             sch.setDfsjT(parseTime(rq, sch.getDfsj(), startTime));
             //计划终点时间
-            if(StringUtils.isEmpty(sch.getZdsj())){
+            if (StringUtils.isEmpty(sch.getZdsj())) {
                 sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
                 sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
-            }
-            else
+            } else
                 sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
             //实发时间
-            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+            if (StringUtils.isNotEmpty(sch.getFcsjActual()))
                 sch.setFcsjActualAll(parseTime(rq, sch.getFcsjActual(), startTime));
             //实达时间
-            if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+            if (StringUtils.isNotEmpty(sch.getZdsjActual()))
                 sch.setZdsjActualAll(parseTime(rq, sch.getZdsjActual(), startTime));
         } catch (Exception e) {
             logger.error("", e);
         }
     }
-    private long parseTime(String rq, String sj, String startTime){
+    private long parseTime(String rq, String sj, String startTime) {
         long t = fmtyyyyMMddHHmm.parseMillis(rq + sj);
-        if(sj.compareTo(startTime) < 0){
+        if (sj.compareTo(startTime) < 0) {
             t += DAY_TIME;
         }
         return t;