update...

潘钊
1 parent 133c631c
Showing 5 changed files with 184 additions and 7 deletions
src/main/java/com/bsth/entity/OilInfo.java
src/main/java/com/bsth/entity/SchedulePlanInfo.java
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/redis/util/DateUtils.java
@@ -126,6 +126,21 @@ public class OilInfo implements Serializable {
     //进场顺序（根据最先出场和最后进场来关联车辆的存油量）
     private int jcsx;
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this.toString().equals(((OilInfo)obj).toString());
+    }
+
+    @Override
+    public String toString() {
+        return "oil_" + this.id;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -102,6 +102,21 @@ public class SchedulePlanInfo implements Serializable {
     /** 关联的时刻表名字 */
     private String ttInfoName;
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this.toString().equals(((SchedulePlanInfo)obj).toString());
+    }
+
+    @Override
+    public String toString() {
+        return "sch_plan_" + this.id;
+    }
+
     public Long getId() {
         return id;
     }
@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 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;
@@ -107,15 +106,15 @@ public class OilRedisService implements CommandLineRunner {
     public void mergeData(String key, List<OilInfo> list) {
         key = REDIS_KEY_PREFIX + key;
-        ListOperations<String, OilInfo> ops = redisTemplate.opsForList();
+/*        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));
     }
@@ -2,6 +2,7 @@ package com.bsth.redis;
 import com.bsth.Application;
 import com.bsth.entity.SchedulePlanInfo;
+import com.bsth.redis.util.DateUtils;
 import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.SchedulePlanInfoRepository;
 import com.bsth.server_rs.base_info.line.Line;
@@ -134,8 +135,11 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         //写入redis
         wirte(list);
-        //24小时清理一次计划排班数据
-        Application.mainServices.scheduleWithFixedDelay(planClearThread, 24, 24, TimeUnit.HOURS);
+        //定时 00:05 分清理计划，并加载当天的计划
+        long diff = (DateUtils.getTimestamp() + 1000 * 60 * 5) - System.currentTimeMillis();
+        if (diff < 0)
+            diff += (1000 * 60 * 60 * 24);
+        Application.mainServices.scheduleAtFixedRate(planClearThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
     }
     public List<SchedulePlanInfo> findByMultiLine(List<String> lineArray, String rq) {
@@ -152,7 +156,8 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         @Autowired
         PlanScheduleRedisService planRedisService;
-
+        @Autowired
+        SchedulePlanInfoRepository planInfoRepository;
         @Override
         public void run() {
             try {
@@ -167,6 +172,13 @@ public class PlanScheduleRedisService implements CommandLineRunner {
                 for (Line line : lines) {
                     planRedisService.delete(line.getLineCode(), rq);
                 }
+
+                //加载当天的计划
+                Date d = new Date();
+                Date s = new Date(d.getTime() - 1000 * 60 * 60 * 24);
+                List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(s, d);
+                //写入redis
+                planRedisService.wirte(list);
             } catch (Exception e) {
                 logger.error("", e);
             }
+package com.bsth.redis.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class DateUtils {
+
+	// 获得当天0点时间
+	public static int getTimesmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+	
+	// 获得当天0点毫秒时间戳
+	public static long getTimestamp() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTimeInMillis();
+	}
+	
+	public static Long getTimesmorning(Calendar cal) {
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTimeInMillis() / 1000;
+	}
+
+	// 获得当天24点时间
+	public static int getTimesnight() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+	
+	// 获得当天24点时间 毫秒
+	public static Long getTimesnight2() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTimeInMillis();
+	}
+	
+	public static Long getTimesnight(Calendar cal) {
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTimeInMillis();
+	}
+
+	// 获得本周一0点时间
+	public static int getTimesWeekmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+
+	// 获得本周日24点时间
+	public static int getTimesWeeknight() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+		return (int) ((cal.getTime().getTime() + (7 * 24 * 60 * 60 * 1000)) / 1000);
+	}
+
+	// 获得本月第一天0点时间
+	public static int getTimesMonthmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+
+	// 获得本月最后一天24点时间
+	public static int getTimesMonthnight() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+	
+	private static SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm") 
+				,sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd")
+				,sdfHHmm = new SimpleDateFormat("HH:mm"); 
+	public static long getTimesByHHmm(String str) throws ParseException{
+		Date d = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(new Date()) + str);
+		return d.getTime();
+	}
+	
+	public static String plusDay(String old, int day){
+		Calendar cal = null;
+		try {
+			Date date = sdfyyyyMMdd.parse(old);
+			cal = Calendar.getInstance();
+			cal.setTime(date);
+			cal.add(Calendar.DATE, day);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return sdfyyyyMMdd.format(cal.getTime());
+	}
+	
+	public static String subtractDay(String old, int day){
+		Calendar cal = null;
+		try {
+			Date date = sdfyyyyMMdd.parse(old);
+			cal = Calendar.getInstance();
+			cal.setTime(date);
+			cal.set(Calendar.DATE, cal.get(Calendar.DATE) - day);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return sdfyyyyMMdd.format(cal.getTime());
+	}
+
+	public static int calcHHmmDiff(String fcsj, String zdsj) throws ParseException {
+		return (int) (sdfHHmm.parse(zdsj).getTime() - sdfHHmm.parse(fcsj).getTime());
+	}
+}