update...

潘钊
1 parent 6d35011e
Showing 6 changed files with 12 additions and 12 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
@@ -92,7 +92,7 @@ public class XDApplication implements CommandLineRunner {
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //实际排班延迟入库线程
-        //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
@@ -110,7 +110,7 @@ public class XDApplication implements CommandLineRunner {
         //实际排班更新线程
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //实际排班延迟入库线程
-        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //检查班次误点
         sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
         //调度指令延迟入库
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
 /**
  * @author PanZhao
@@ -59,7 +60,7 @@ public class DayOfSchedule {
     private static Map<String, ScheduleRealInfo> carExecutePlanMap;
     // 持久化
-    public static LinkedList<ScheduleRealInfo> pstBuffer;
+    public static ConcurrentLinkedQueue<ScheduleRealInfo> pstBuffer;
     // 排序器
     private static ScheduleComparator.FCSJ schFCSJComparator;
@@ -92,7 +93,7 @@ public class DayOfSchedule {
         lpScheduleMap = ArrayListMultimap.create();
         id2SchedulMap = new HashMap<>();
-        pstBuffer = new LinkedList<>();
+        pstBuffer = new ConcurrentLinkedQueue<>();
         schFCSJComparator = new ScheduleComparator.FCSJ();
         currSchDateMap = new HashMap<>();
         carExecutePlanMap = new HashMap<>();
@@ -10,7 +10,6 @@ import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
 import org.springframework.stereotype.Component;
 import javax.persistence.EntityNotFoundException;
-import java.util.LinkedList;
 /**
  * @author PanZhao
@@ -29,11 +28,11 @@ public class SchedulePstThread extends Thread {
     @Override
     public void run() {
-        LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
+        //LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
         ScheduleRealInfo schedule;
         for (int i = 0; i < 1000; i++) {
-            schedule = list.poll();
+            schedule = DayOfSchedule.pstBuffer.poll();
             if (null == schedule)
                 break;
@@ -47,7 +46,7 @@ public class SchedulePstThread extends Thread {
                 logger.error("EntityNotFoundException error.... 可忽略");
             }
             catch (Exception e) {
-                logger.error("", e);
+                logger.error("班次入库的时候出现未知异常！！", e);
             }
         }
     }
@@ -925,7 +925,7 @@ public class ScheduleRealInfo {
 		this.fcpSn = fcpSn;
 	}
-	public boolean isInout(){
+	public boolean _isInout(){
 		return this.getBcType().equals("out") || this.getBcType().equals("in");
 	}
 }
@@ -1325,7 +1325,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isNotEmpty(jhlc)) {
                 double jhlcNum = Double.parseDouble(jhlc);
                 //烂班
-                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch.isInout())
+                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout())
                     destroy(sch.getId() + "", "", map.get("adjustExps").toString());
                 else if(jhlcNum != sch.getJhlc()){
                     sch.setJhlc(jhlcNum);
@@ -129,13 +129,13 @@
             {{else if bcType == "region"}}
             <span class="uk-badge sch_region">区间</span>
             {{else if bcType == "ldks"}}
-            <span class="uk-badge uk-badge-notification sch_ldks">空驶</span>
+            <span class="uk-badge sch_ldks">空驶</span>
             {{/if}}
             {{if sflj}}
             <span class="uk-badge uk-badge-danger">临加</span>
             {{/if}}
             {{if cTasks.length > 0}}
-            <span class="uk-badge c_task">{{cTasks.length}}</span>
+            <span class="uk-badge uk-badge-notification c_task">{{cTasks.length}}</span>
             {{/if}}
         </dd>
     </script>