潘钊 / bsth_control · Commits

Commit 8f277483030c75d4c0ebc542ea0e54cd9d7300e3

Authored by 潘钊
2 parents 7b8a7b79 45c2e6ad
build: skipped

Merge branch 'minhang' into pudong

Inline Side-by-side
Showing 6 changed files with 12 additions and 12 deletions
src/main/java/com/bsth/XDApplication.java
  View file @8f27748
... ... @@ -92,7 +92,7 @@ public class XDApplication implements CommandLineRunner {
92 92 //实际排班更新线程
93 93 //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
94 94 //实际排班延迟入库线程
95   - //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
  95 + //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
96 96  
97 97 //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
98 98 //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
... ... @@ -110,7 +110,7 @@ public class XDApplication implements CommandLineRunner {
110 110 //实际排班更新线程
111 111 sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
112 112 //实际排班延迟入库线程
113   - sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
  113 + sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
114 114 //检查班次误点
115 115 sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
116 116 //调度指令延迟入库
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @8f27748
... ... @@ -31,6 +31,7 @@ import org.springframework.stereotype.Component;
31 31 import java.text.ParseException;
32 32 import java.text.SimpleDateFormat;
33 33 import java.util.*;
  34 +import java.util.concurrent.ConcurrentLinkedQueue;
34 35  
35 36 /**
36 37 * @author PanZhao
... ... @@ -59,7 +60,7 @@ public class DayOfSchedule {
59 60 private static Map<String, ScheduleRealInfo> carExecutePlanMap;
60 61  
61 62 // 持久化
62   - public static LinkedList<ScheduleRealInfo> pstBuffer;
  63 + public static ConcurrentLinkedQueue<ScheduleRealInfo> pstBuffer;
63 64  
64 65 // 排序器
65 66 private static ScheduleComparator.FCSJ schFCSJComparator;
... ... @@ -92,7 +93,7 @@ public class DayOfSchedule {
92 93 lpScheduleMap = ArrayListMultimap.create();
93 94  
94 95 id2SchedulMap = new HashMap<>();
95   - pstBuffer = new LinkedList<>();
  96 + pstBuffer = new ConcurrentLinkedQueue<>();
96 97 schFCSJComparator = new ScheduleComparator.FCSJ();
97 98 currSchDateMap = new HashMap<>();
98 99 carExecutePlanMap = new HashMap<>();
... ...
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
  View file @8f27748
... ... @@ -10,7 +10,6 @@ import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
10 10 import org.springframework.stereotype.Component;
11 11  
12 12 import javax.persistence.EntityNotFoundException;
13   -import java.util.LinkedList;
14 13  
15 14 /**
16 15 * @author PanZhao
... ... @@ -29,11 +28,11 @@ public class SchedulePstThread extends Thread {
29 28 @Override
30 29 public void run() {
31 30  
32   - LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
  31 + //LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
33 32  
34 33 ScheduleRealInfo schedule;
35 34 for (int i = 0; i < 1000; i++) {
36   - schedule = list.poll();
  35 + schedule = DayOfSchedule.pstBuffer.poll();
37 36 if (null == schedule)
38 37 break;
39 38  
... ... @@ -47,7 +46,7 @@ public class SchedulePstThread extends Thread {
47 46 logger.error("EntityNotFoundException error.... 可忽略");
48 47 }
49 48 catch (Exception e) {
50   - logger.error("", e);
  49 + logger.error("班次入库的时候出现未知异常！！", e);
51 50 }
52 51 }
53 52 }
... ...
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
  View file @8f27748
... ... @@ -925,7 +925,7 @@ public class ScheduleRealInfo {
925 925 this.fcpSn = fcpSn;
926 926 }
927 927  
928   - public boolean isInout(){
  928 + public boolean _isInout(){
929 929 return this.getBcType().equals("out") || this.getBcType().equals("in");
930 930 }
931 931 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @8f27748
... ... @@ -1325,7 +1325,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1325 1325 if (StringUtils.isNotEmpty(jhlc)) {
1326 1326 double jhlcNum = Double.parseDouble(jhlc);
1327 1327 //烂班
1328   - if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch.isInout())
  1328 + if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout())
1329 1329 destroy(sch.getId() + "", "", map.get("adjustExps").toString());
1330 1330 else if(jhlcNum != sch.getJhlc()){
1331 1331 sch.setJhlc(jhlcNum);
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
  View file @8f27748
... ... @@ -129,13 +129,13 @@
129 129 {{else if bcType == "region"}}
130 130 <span class="uk-badge sch_region">区间</span>
131 131 {{else if bcType == "ldks"}}
132   - <span class="uk-badge uk-badge-notification sch_ldks">空驶</span>
  132 + <span class="uk-badge sch_ldks">空驶</span>
133 133 {{/if}}
134 134 {{if sflj}}
135 135 <span class="uk-badge uk-badge-danger">临加</span>
136 136 {{/if}}
137 137 {{if cTasks.length > 0}}
138   - <span class="uk-badge c_task">{{cTasks.length}}</span>
  138 + <span class="uk-badge uk-badge-notification c_task">{{cTasks.length}}</span>
139 139 {{/if}}
140 140 </dd>
141 141 </script>
... ...