潘钊 / bsth_control · Commits

Commit a078cb179538d483c7a73c06f66c6996f2efc899

Authored by panzhaov5
1 parent cc3f91ad

update...

Inline Side-by-side
Showing 3 changed files with 8 additions and 2 deletions
src/main/java/com/bsth/data/Station2ParkBuffer.java
  View file @a078cb1
... ... @@ -50,6 +50,8 @@ public class Station2ParkBuffer implements CommandLineRunner {
50 50  
51 51 public static StationToPark get(String lineCode, String sName, String eName) {
52 52 List<StationToPark> list = get(lineCode);
  53 + if(null == list)
  54 + return null;
53 55 StationToPark stp = null;
54 56 for (StationToPark s : list) {
55 57 if (s.getStationName().equals(sName) && s.getParkName().equals(eName)) {
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @a078cb1
... ... @@ -16,6 +16,8 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
16 16 import com.bsth.websocket.handler.SendUtils;
17 17 import com.google.common.collect.ArrayListMultimap;
18 18 import com.google.common.collect.HashMultimap;
  19 +import com.google.common.collect.ListMultimap;
  20 +import com.google.common.collect.Multimaps;
19 21 import org.apache.commons.lang3.StringUtils;
20 22 import org.joda.time.format.DateTimeFormat;
21 23 import org.joda.time.format.DateTimeFormatter;
... ... @@ -55,7 +57,7 @@ public class DayOfSchedule {
55 57 public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
56 58  
57 59 // 按车辆分组的班次数据
58   - private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
  60 + private static ListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
59 61  
60 62 //按线路分组计划用车
61 63 private static HashMultimap<String, String> lineNbbmsMap;
... ... @@ -104,6 +106,8 @@ public class DayOfSchedule {
104 106  
105 107 static {
106 108 nbbmScheduleMap = ArrayListMultimap.create();
  109 + nbbmScheduleMap = Multimaps.synchronizedListMultimap(nbbmScheduleMap);
  110 +
107 111 lpScheduleMap = ArrayListMultimap.create();
108 112 lineNbbmsMap = HashMultimap.create();
109 113  
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
  View file @a078cb1
... ... @@ -298,7 +298,7 @@
298 298 nbbm: nbbm
299 299 }
300 300 , function (rs) {
301   - $('form.tzrc_form [type=submit]', modal).removeAttr('disabled');
  301 + //$('form.tzrc_form [type=submit]', modal).removeAttr('disabled');
302 302 if(rs['checkStatus']==1)
303 303 cb && cb();
304 304 else if (rs['checkStatus']==-2){
... ...