update...

潘钊
1 parent 5ee4d437
Showing 6 changed files with 211 additions and 33 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/redis/util/RedisUtils.java
src/main/java/com/bsth/server_rs/AuthorizeInterceptor_IN.java
@@ -11,7 +11,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(5);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(10);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 package com.bsth.redis;
 import com.bsth.entity.OilInfo;
+import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.OilInfoRepository;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.ConvertUtil;
@@ -32,6 +33,9 @@ public class OilRedisService implements CommandLineRunner {
     @Autowired
     OilInfoRepository oilInfoRepository;
+    @Autowired
+    RedisUtils redisUtils;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     private final static String REDIS_KEY_PREFIX = "oil:";
@@ -107,10 +111,9 @@ public class OilRedisService implements CommandLineRunner {
             if (!list.contains(oil))
                 list.add(oil);
         }
-        //删除redis数据
-        redisTemplate.delete(key);
-        //重新写入
-        ops.leftPushAll(key, list);
+
+        //更新
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
     }
     @Override
 package com.bsth.redis;
+import com.bsth.Application;
 import com.bsth.entity.SchedulePlanInfo;
+import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.SchedulePlanInfoRepository;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.ConvertUtil;
 import com.google.common.collect.ArrayListMultimap;
@@ -14,15 +18,17 @@ import org.springframework.core.annotation.Order;
 import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 /**
- *  计调的 计划排班redis缓存
+ * 计调的 计划排班redis缓存
  * Created by panzhao on 2017/3/27.
  */
 @Service
@@ -35,7 +41,10 @@ public class PlanScheduleRedisService implements CommandLineRunner {
     @Autowired
     SchedulePlanInfoRepository planInfoRepository;
-    Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    RedisUtils redisUtils;
+
+    static Logger logger = LoggerFactory.getLogger(PlanScheduleRedisService.class);
     private final static String REDIS_KEY_PREFIX = "plan:";
@@ -58,7 +67,7 @@ public class PlanScheduleRedisService implements CommandLineRunner {
             String key;
             while (iterator.hasNext()) {
                 key = iterator.next();
-                mergeData(key, multimap.get(key));
+                replace(key, multimap.get(key));
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -81,10 +90,20 @@ public class PlanScheduleRedisService implements CommandLineRunner {
             if (!list.contains(plan))
                 list.add(plan);
         }
-        //删除redis数据
-        redisTemplate.delete(key);
-        //重新写入
-        ops.leftPushAll(key, list);
+
+        //更新
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
+    }
+
+    /**
+     * 覆盖数据
+     *
+     * @param key
+     * @param list
+     */
+    public void replace(String key, List<SchedulePlanInfo> list) {
+        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
     }
     /**
@@ -98,6 +117,10 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         return redisTemplate.opsForList().range(REDIS_KEY_PREFIX + lineCode + ":" + dateStr, 0, -1);
     }
+
+    @Autowired
+    PlanClearThread planClearThread;
+
     @Override
     public void run(String... strings) throws Exception {
         int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
@@ -108,17 +131,50 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         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);
+
+        //24小时清理一次计划排班数据
+        Application.mainServices.scheduleWithFixedDelay(planClearThread, 24, 24, TimeUnit.HOURS);
     }
     public List<SchedulePlanInfo> findByMultiLine(List<String> lineArray, String rq) {
         rq = rq.replaceAll("-", "");
         List<SchedulePlanInfo> rs = new ArrayList<>();
-        for(String lineCode : lineArray){
+        for (String lineCode : lineArray) {
             rs.addAll(read(rq, lineCode));
         }
         return rs;
     }
+
+    @Component
+    public static class PlanClearThread extends Thread {
+
+        @Autowired
+        PlanScheduleRedisService planRedisService;
+
+        @Override
+        public void run() {
+            try {
+                logger.info("redis -清理计划排班");
+
+                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+                DateTime dt = new DateTime();
+                dt = dt.minusDays(cacheDays);
+                String rq = dt.toString("yyyy-MM-dd");
+
+                List<Line> lines = LineBufferData.findAll();
+                for (Line line : lines) {
+                    planRedisService.delete(line.getLineCode(), rq);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
+
+    private void delete(String lineCode, String rq) {
+        String key = REDIS_KEY_PREFIX + (lineCode + ":" + rq).replaceAll("-", "");
+        redisTemplate.delete(key);
+    }
 }
 package com.bsth.redis;
+import com.bsth.Application;
 import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.ScheduleRealInfoRepository;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_ws.WebServiceProxy;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.ConvertUtil;
-import com.bsth.server_ws.WebServiceProxy;
 import com.google.common.collect.ArrayListMultimap;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
@@ -15,11 +19,13 @@ import org.springframework.core.annotation.Order;
 import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 /**
  * 班次 redis 缓存管理
@@ -40,7 +46,10 @@ public class ScheduleRedisService implements CommandLineRunner {
     @Autowired
     WebServiceProxy webServiceProxy;
-    Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    RedisUtils redisUtils;
+
+    static Logger logger = LoggerFactory.getLogger(ScheduleRedisService.class);
     /**
      * 将一批班次写入redis
@@ -61,7 +70,7 @@ public class ScheduleRedisService implements CommandLineRunner {
             String key;
             while (iterator.hasNext()) {
                 key = iterator.next();
-                mergeData(key, multimap.get(key));
+                replace(key, multimap.get(key));
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -84,10 +93,30 @@ public class ScheduleRedisService implements CommandLineRunner {
             if (!list.contains(sch))
                 list.add(sch);
         }
-        //删除redis数据
-         redisTemplate.delete(key);
-        //重新写入
-        ops.leftPushAll(key, list);
+
+        //更新
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
+    }
+
+    /**
+     * 覆盖数据
+     *
+     * @param key
+     * @param list
+     */
+    public void replace(String key, List<ScheduleRealInfo> list) {
+        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param key
+     */
+    public void delete(String lineCode, String rq) {
+        String key = REDIS_KEY_PREFIX + (lineCode + ":" + rq).replaceAll("-", "");
+        redisTemplate.delete(key);
     }
     /**
@@ -103,22 +132,23 @@ public class ScheduleRedisService implements CommandLineRunner {
     /**
      * 返回指定日期，公司的实际排班，并按线路_车辆分组
-     *  （新老系统并行时调用这个函数）
+     * （新老系统并行时调用这个函数）
+     *
      * @param rq
      * @param companyId
      * @return
      */
-    public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByNbbm_bingxing(String rq, String companyId){
+    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){
+        for (String lineCode : lineArray) {
             list = read(rq, lineCode);
-            for(ScheduleRealInfo sch : list){
+            for (ScheduleRealInfo sch : list) {
                 rs.put(sch.getXlBm() + "_" + sch.getClZbh(), sch);
             }
         }
@@ -127,21 +157,22 @@ public class ScheduleRedisService implements CommandLineRunner {
     /**
      * 返回指定日期，公司的实际排班，并按线路_车辆分组
+     *
      * @param rq
      * @param companyId
      * @return
      */
-    public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByNbbm(String rq, String companyId){
+    public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByNbbm(String rq, String companyId) {
         List<String> lineArray = webServiceProxy.findLinesByCompany(companyId);
         ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create();
         rq = rq.replaceAll("-", "");
         List<ScheduleRealInfo> list;
-        for(String lineCode : lineArray){
+        for (String lineCode : lineArray) {
             list = read(rq, lineCode);
-            for(ScheduleRealInfo sch : list){
+            for (ScheduleRealInfo sch : list) {
                 rs.put(sch.getXlBm() + "_" + sch.getClZbh(), sch);
             }
         }
@@ -150,28 +181,34 @@ public class ScheduleRedisService implements CommandLineRunner {
     /**
      * 返回指定日期，公司的实际排班，并按线路分组
+     *
      * @param rq
      * @param companyId
      * @return
      */
-    public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByLine(String rq, String companyId){
+    public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByLine(String rq, String companyId) {
         List<String> lineArray = webServiceProxy.findLinesByCompany(companyId);
         ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create();
         rq = rq.replaceAll("-", "");
         List<ScheduleRealInfo> list;
-        for(String lineCode : lineArray){
+        for (String lineCode : lineArray) {
             list = read(rq, lineCode);
-            for(ScheduleRealInfo sch : list){
+            for (ScheduleRealInfo sch : list) {
                 rs.put(sch.getXlBm(), sch);
             }
         }
         return rs;
     }
+    @Autowired
+    ScheduleRefreshThread scheduleRefreshThread;
+    @Autowired
+    ScheduleClearThread scheduleClearThread;
+
     @Override
     public void run(String... strings) throws Exception {
         int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
@@ -183,14 +220,65 @@ public class ScheduleRedisService implements CommandLineRunner {
         List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDateLT(dt.toString("yyyy-MM-dd"));
         //写入redis
         wirte(list);
+
+        //定时刷新一次当日实际排班
+        int minute = 30;
+        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, minute, minute, TimeUnit.MINUTES);
+        //24小时清理一次实际排班数据
+        Application.mainServices.scheduleWithFixedDelay(scheduleClearThread, 24, 24, TimeUnit.HOURS);
     }
     public List<ScheduleRealInfo> findByMultiLine(List<String> lineArray, String rq) {
         rq = rq.replaceAll("-", "");
         List<ScheduleRealInfo> rs = new ArrayList<>();
-        for(String lineCode : lineArray){
+        for (String lineCode : lineArray) {
             rs.addAll(read(rq, lineCode));
         }
         return rs;
     }
+
+    @Component
+    public static class ScheduleRefreshThread extends Thread {
+
+        @Autowired
+        ScheduleRealInfoRepository realInfoRepository;
+
+        @Autowired
+        ScheduleRedisService scheduleRedisService;
+
+        @Override
+        public void run() {
+            try {
+                DateTime dt = new DateTime();
+                List<ScheduleRealInfo> list = realInfoRepository.findAll(dt.toString("yyyy-MM-dd"));
+                scheduleRedisService.wirte(list);
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
+
+    @Component
+    public static class ScheduleClearThread extends Thread {
+
+        @Autowired
+        ScheduleRedisService scheduleRedisService;
+
+        @Override
+        public void run() {
+            try {
+                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+                DateTime dt = new DateTime();
+                dt = dt.minusDays(cacheDays);
+                String rq = dt.toString("yyyy-MM-dd");
+
+                List<Line> lines = LineBufferData.findAll();
+                for (Line line : lines) {
+                    scheduleRedisService.delete(line.getLineCode(), rq);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
 }
+package com.bsth.redis.util;
+
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.data.redis.core.SessionCallback;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class RedisUtils<T> {
+
+    public SessionCallback getUpdateCallback(final String key, final List<T> list){
+
+        SessionCallback<Object> sessionCallback = new SessionCallback<Object>() {
+
+            @Override
+            public Object execute(RedisOperations redisOperations) throws DataAccessException {
+                redisOperations.multi();
+                redisOperations.delete(key);
+                redisOperations.opsForList().leftPushAll(key, list);
+                return redisOperations.exec();
+            }
+        };
+
+        return sessionCallback;
+    }
+}
@@ -57,7 +57,7 @@ public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor&lt;Message&gt; i
             return ;
         }
-        //获取参数，不包括 url 路径参数  ?号之后的
+        //获取参数，不包括 url 路径参数  只包括?号之后的
         String queryString = StringEscapeUtils.unescapeHtml4(message.get(Message.QUERY_STRING).toString());
         MultiMap<String> params = new MultiMap<>();
         UrlEncoded.decodeTo(queryString, params, "utf-8");