update...

潘钊
1 parent a917eba4
Showing 7 changed files with 81 additions and 24 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/overspeed/OverspeedProcess.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -5,6 +5,7 @@ import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
@@ -41,6 +42,9 @@ public class AdminUtilsController {
     @Autowired
     SendUtils sendUtils;
+    @Autowired
+    PilotReport pilotReport;
+
     /**
      * 出现重复班次的车辆
      * @param
@@ -132,6 +136,7 @@ public class AdminUtilsController {
     public Map<String, Integer> containerSize(){
         Map<String, Integer> rs = new HashMap<>();
         rs.put("60_size", dayOfDirectives.all60().size());
+        rs.put("80_size", pilotReport.findAll().size());
         rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
         rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
         rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 
@@ -29,13 +30,10 @@ import java.util.concurrent.ConcurrentHashMap;
 public class DayOfDirectives {
 	// 当日60指令缓存
-	private static Map<Integer, D60> d60Map;
+	private static ConcurrentMap<Integer, D60> d60Map;
 	// 线路切换指令 64
-	public static Map<String, D64> d64Map;
-	
-	//等待C0_A4回复的用户
-	//public static Map<K, V>
+	public static ConcurrentMap<String, D64> d64Map;
 	//等待入库的指令
 	public static LinkedList<Directive> pstDirectives;
@@ -149,9 +147,53 @@ public class DayOfDirectives {
 			return;
 		directiveService.save(d60);
+	}
+
+	public void clear(String lineCode){
+		int c60 = 0, c64 = 0;
+
+		Collection<D60> d60s = d60Map.values();
+		List<D60> rem60List = new ArrayList<>();
+		for(D60 d60 : d60s){
+			if(d60.getLineCode().equals(lineCode))
+				rem60List.add(d60);
+		}
+
+		//清除60数据
+		for(D60 d60 : rem60List){
+			if(d60.getReply47() == null)
+				directiveService.save(d60);
+			if(null != d60Map.remove(d60.getMsgId()))
+				c60 ++;
+		}
+
+		rem60List.clear();
+		if(c60 > 0)
+			logger.info("清除60数据 ，" + c60);
+
+		//找到该设备的64数据
+		Collection<D64> d64s = d64Map.values();
+		List<D64> rem64List = new ArrayList<>();
+		for(D64 d64 : d64s){
+			if(d64.get)
+				rem64List.add(d64);
+		}
+
+		//清除64数据
+		for(D64 d64 : rem64List){
+			if(d64.getRespAck() == null)
+				directiveService.save64(d64);
+
+			if(null != d64Map.remove(d64.getKey()))
+				c64 ++;
+		}
+
+		rem64List.clear();
+		if(c64 > 0)
+			logger.info("清除64数据 ，" + c64);
 	}*/
-	
-	public void clear(String device){
+
+/*	public void clear(String device){
 		int c60 = 0, c64 = 0;
 		Collection<D60> d60s = d60Map.values();
@@ -193,6 +235,12 @@ public class DayOfDirectives {
 		rem64List.clear();
 		if(c64 > 0)
 			logger.info("清除64数据 ，" + c64);
+	}*/
+
+	public void clearAll(){
+		d60Map = new ConcurrentHashMap<>();
+		d64Map = new ConcurrentHashMap<>();
+		logger.info("清除指令数据 ,,,");
 	}
 	public Collection<D60> all60(){
@@ -43,7 +43,7 @@ public class OverspeedProcess {
      */
     private static Map<String, Integer> contSpeedMap;
-    Logger logger = LoggerFactory.getLogger(this.getClass());
+    static Logger logger = LoggerFactory.getLogger(OverspeedProcess.class);
     static{
         multimap = ArrayListMultimap.create();
@@ -60,6 +60,8 @@ public class OverspeedProcess {
         realOverspeedMap = null;
         realOverspeedMap = new HashMap();
+
+        logger.info("清理超速缓存数据，，，");
     }
     public boolean process(GpsEntity gps){
@@ -3,6 +3,8 @@ package com.bsth.data.safe_driv;
 import com.bsth.websocket.handler.SendUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -33,6 +35,8 @@ public class SafeDrivCenter implements ApplicationContextAware {
      */
     private static Map<String, SafeDriv> safeMap;
+    static Logger logger = LoggerFactory.getLogger(SafeDrivCenter.class);
+
     static {
         data = new HashSet<>();
         safeMap = new HashMap<>();
@@ -61,6 +65,7 @@ public class SafeDrivCenter implements ApplicationContextAware {
     public static void clear(){
         data = new HashSet<>();
         safeMap = new HashMap<>();
+        logger.info("清除安全驾驶数据，，，");
     }
     @Override
 package com.bsth.data.schedule.thread;
+import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
@@ -27,6 +28,9 @@ public class CalcOilThread extends Thread{
     SheetService sheetService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
     @Override
     public void run() {
         try{
@@ -37,12 +41,15 @@ public class CalcOilThread extends Thread{
             logger.info("开始计算班次准点率....");
             sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
-            //清除安全驾驶数据 先临时蹭这个线程
-            SafeDrivCenter.clear();
-            //清除超速缓存数据
-            OverspeedProcess.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
+
+        //清除指令数据
+        dayOfDirectives.clearAll();
+        //清除安全驾驶数据
+        SafeDrivCenter.clear();
+        //清除超速缓存数据
+        OverspeedProcess.clear();
     }
 }
 package com.bsth.data.schedule.thread;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
@@ -56,17 +55,15 @@ public class ScheduleRefreshThread extends Thread{
 					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
-						//logger.info(lineCode + "开始翻班， " + currSchDate);
-
 						try{
-							//清除指令数据
 							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
 							for(String car : cars){
-								dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
 								GpsCacheData.remove(car);
 							}
 							//清除驾驶员上报数据
 							pilotReport.clear(lineCode);
+							//清除指令数据 指令数据，直接定时全部清空
+							//dayOfDirectives.clear(lineCode);
 						}catch (Exception e){
 							logger.error("清理 60 和 80出现问题", e);
 						}
@@ -698,13 +698,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //数据库删除
             rs = super.delete(id);
             if(rs.get("status").equals(ResponseCode.SUCCESS)){
-                /*ScheduleRealInfo temp = super.findById(id);
-                if(temp != null){
-                    rs.put("status", ResponseCode.ERROR);
-                    rs.put("msg", "删除失败，请重试！");
-                    return rs;
-                }*/
-
                 dayOfSchedule.delete(sch);
                 //更新起点应到时间
                 List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);