update...

潘钊
1 parent d7e1c51c
Showing 4 changed files with 21 additions and 52 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/server_rs/gps/buffer/GpsRealDataBuffer.java
 package com.bsth;
  
  
+import com.bsth.server_rs.gps.buffer.GpsRefreshThread;
 import com.bsth.server_rs.schedule.real.thread.ExecSchDataRefreshThread;
 import com.bsth.server_rs.schedule.real.thread.SchInOutDataRefreshThread;
 import com.bsth.server_rs.thread.RfidCardInfoPersistenceThread;
@@ -23,12 +24,12 @@ public class StartCommand implements CommandLineRunner{
  
 	@Autowired
 	RfidCardInfoPersistenceThread rfidCardInfoPersistenceThread;
-
 	@Autowired
 	SchInOutDataRefreshThread schInOutDataRefreshThread;
-
 	@Autowired
 	ExecSchDataRefreshThread execSchDataRefreshThread;
+	@Autowired
+	GpsRefreshThread gpsRefreshThread;
  
 	@Override
 	public void run(String... arg0){
@@ -37,11 +38,14 @@ public class StartCommand implements CommandLineRunner{
 			ScheduledExecutorService sexec = Application.mainServices;
 			//定时将人车卡数据入库
 			sexec.scheduleWithFixedDelay(rfidCardInfoPersistenceThread, 120, 60 * 10, TimeUnit.SECONDS);
-
 			//定时从调度系统刷新进出场数据
 			sexec.scheduleWithFixedDelay(schInOutDataRefreshThread, 40, 20, TimeUnit.SECONDS);
 			//定时从调度系统刷新车辆正在的执行班次
 			sexec.scheduleWithFixedDelay(execSchDataRefreshThread, 20, 60 * 2, TimeUnit.SECONDS);
+			//定时刷新实时gps缓存
+			Application.mainServices.scheduleWithFixedDelay(gpsRefreshThread, 10, 7, TimeUnit.SECONDS);
+
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -106,14 +106,6 @@ public class OilRedisService implements CommandLineRunner {
     public void mergeData(String key, List<OilInfo> list) {
         key = REDIS_KEY_PREFIX + key;
  
-/*        ListOperations<String, OilInfo> ops = redisTemplate.opsForList();
-        List<OilInfo> cacheList = ops.range(key, 0, -1);
-
-        for (OilInfo oil : cacheList) {
-            if (!list.contains(oil))
-                list.add(oil);
-        }*/
-
         //更新  直接覆盖更新
         redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
     }
@@ -123,15 +115,19 @@ public class OilRedisService implements CommandLineRunner {
  
     @Override
     public void run(String... strings) throws Exception {
+        //启动加载油耗缓存
+        synchData(null);
         //定时刷新油耗信息
-        Application.mainServices.scheduleWithFixedDelay(oilRefreshThread, 40, 60 * 40, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(oilRefreshThread, 60 * 40, 60 * 40, TimeUnit.SECONDS);
     }
  
     /**
      * 和数据库同步数据
      */
-    public void synchData(){
+    public void synchData(Integer days){
         int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+        if(null != days && days < cacheDays)
+            cacheDays = days;
         //设置key 序列化器
         redisTemplate.setKeySerializer(new StringRedisSerializer());
  
@@ -140,6 +136,7 @@ public class OilRedisService implements CommandLineRunner {
         List<OilInfo> list = oilInfoRepository.findByDateLT(dt.toDate());
         //写入redis
         wirte(list);
+        logger.info("刷新油耗数据, days: " + cacheDays + " -size: " + list.size());
     }
  
     @Component
@@ -150,7 +147,7 @@ public class OilRedisService implements CommandLineRunner {
         @Override
         public void run() {
             try {
-                oilRedisService.synchData();
+                oilRedisService.synchData(2);
             } catch (Exception e) {
                 logger.error("", e);
             }
@@ -134,31 +134,6 @@ public class ScheduleRedisService implements CommandLineRunner {
  
     /**
      * 返回指定日期，公司的实际排班，并按线路_车辆分组
-     * （新老系统并行时调用这个函数）
-     *
-     * @param rq
-     * @param companyId
-     * @return
-
-    public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByNbbm_bingxing(String rq, String companyId) {
-        List<String> lineArray = webServiceProxy.findLinesByCompany_new(companyId);
-        ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create();
-
-        rq = rq.replaceAll("-", "");
-        List<ScheduleRealInfo> list;
-        for (String lineCode : lineArray) {
-
-            list = read(rq, lineCode);
-
-            for (ScheduleRealInfo sch : list) {
-                rs.put(sch.getXlBm() + "_" + sch.getClZbh(), sch);
-            }
-        }
-        return rs;
-    }*/
-
-    /**
-     * 返回指定日期，公司的实际排班，并按线路_车辆分组
      *
      * @param rq
      * @param companyId
@@ -253,12 +228,15 @@ public class ScheduleRedisService implements CommandLineRunner {
         public void run() {
             try {
                 DateTime dt = new DateTime();
-                logger.info("ScheduleRefreshThread..." + dt.toString("yyyy-MM-dd"));
-                List<ScheduleRealInfo> list = realInfoRepository.findAll(dt.toString("yyyy-MM-dd"));
+                String rq = dt.toString("yyyy-MM-dd");
+                logger.info("ScheduleRefreshThread..." + rq + " -start");
+                List<ScheduleRealInfo> list = realInfoRepository.findAll(rq);
  
                 //计算时间戳
                 scheduleRedisService.calcTime(list);
                 scheduleRedisService.wirte(list);
+
+                logger.info("ScheduleRefreshThread..." + rq + " -end");
             } catch (Exception e) {
                 logger.error("", e);
             }
 package com.bsth.server_rs.gps.buffer;
  
-import com.bsth.Application;
 import com.bsth.server_rs.gps.entity.GpsEntity;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
  
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
  
 /**
  * Created by panzhao on 2017/3/30.
  */
 @Component
-@Order(8)
-public class GpsRealDataBuffer implements CommandLineRunner {
+public class GpsRealDataBuffer {
  
     private static Map<String, GpsEntity> realMap;
  
@@ -39,9 +34,4 @@ public class GpsRealDataBuffer implements CommandLineRunner {
     public static Collection<GpsEntity> all(){
         return realMap.values();
     }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(gpsRefreshThread, 10, 8, TimeUnit.SECONDS);
-    }
 }