Commit d5517163d57a93b3639bd12e3f8d4aad66f003fc

Authored by 潘钊
1 parent b3c2f0b9

title 又被改了,整个人都不好了

src/main/java/com/bsth/data/schedule/DayOfSchedule.java
1 package com.bsth.data.schedule; 1 package com.bsth.data.schedule;
2 2
3 -import java.text.ParseException;  
4 -import java.text.SimpleDateFormat;  
5 -import java.util.ArrayList;  
6 -import java.util.Collection;  
7 -import java.util.Collections;  
8 -import java.util.HashMap;  
9 -import java.util.HashSet;  
10 -import java.util.Iterator;  
11 -import java.util.LinkedList;  
12 -import java.util.List;  
13 -import java.util.Map;  
14 -import java.util.Set;  
15 -import java.util.concurrent.TimeUnit;  
16 -  
17 -import com.bsth.data.schedule.thread.SubmitToTrafficManage;  
18 -import org.apache.commons.lang3.StringUtils;  
19 -import org.joda.time.DateTime;  
20 -import org.joda.time.format.DateTimeFormat;  
21 -import org.joda.time.format.DateTimeFormatter;  
22 -import org.slf4j.Logger;  
23 -import org.slf4j.LoggerFactory;  
24 -import org.springframework.beans.factory.annotation.Autowired;  
25 -import org.springframework.boot.CommandLineRunner;  
26 -import org.springframework.stereotype.Component;  
27 -  
28 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
29 import com.alibaba.fastjson.JSONArray; 4 import com.alibaba.fastjson.JSONArray;
30 import com.bsth.Application; 5 import com.bsth.Application;
@@ -34,6 +9,7 @@ import com.bsth.data.gpsdata.GpsRealData; @@ -34,6 +9,7 @@ import com.bsth.data.gpsdata.GpsRealData;
34 import com.bsth.data.schedule.thread.ScheduleLateThread; 9 import com.bsth.data.schedule.thread.ScheduleLateThread;
35 import com.bsth.data.schedule.thread.SchedulePstThread; 10 import com.bsth.data.schedule.thread.SchedulePstThread;
36 import com.bsth.data.schedule.thread.ScheduleRefreshThread; 11 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
  12 +import com.bsth.data.schedule.thread.SubmitToTrafficManage;
37 import com.bsth.entity.realcontrol.LineConfig; 13 import com.bsth.entity.realcontrol.LineConfig;
38 import com.bsth.entity.realcontrol.ScheduleRealInfo; 14 import com.bsth.entity.realcontrol.ScheduleRealInfo;
39 import com.bsth.entity.schedule.SchedulePlanInfo; 15 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -44,6 +20,19 @@ import com.bsth.util.DateUtils; @@ -44,6 +20,19 @@ import com.bsth.util.DateUtils;
44 import com.bsth.websocket.handler.SendUtils; 20 import com.bsth.websocket.handler.SendUtils;
45 import com.google.common.collect.ArrayListMultimap; 21 import com.google.common.collect.ArrayListMultimap;
46 import com.google.common.collect.TreeMultimap; 22 import com.google.common.collect.TreeMultimap;
  23 +import org.apache.commons.lang3.StringUtils;
  24 +import org.joda.time.format.DateTimeFormat;
  25 +import org.joda.time.format.DateTimeFormatter;
  26 +import org.slf4j.Logger;
  27 +import org.slf4j.LoggerFactory;
  28 +import org.springframework.beans.factory.annotation.Autowired;
  29 +import org.springframework.boot.CommandLineRunner;
  30 +import org.springframework.stereotype.Component;
  31 +
  32 +import java.text.ParseException;
  33 +import java.text.SimpleDateFormat;
  34 +import java.util.*;
  35 +import java.util.concurrent.TimeUnit;
47 36
48 /** 37 /**
49 * 38 *
src/main/resources/static/index.html
@@ -145,7 +145,7 @@ tr.row-active td { @@ -145,7 +145,7 @@ tr.row-active td {
145 <div class="page-header-inner "> 145 <div class="page-header-inner ">
146 <!-- LOGO --> 146 <!-- LOGO -->
147 <div class="page-logo"> 147 <div class="page-logo">
148 - <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a> 148 + <a href="index.html" class="logo-default logo-default-text" > 青浦公交调度系统 </a>
149 <div class="menu-toggler sidebar-toggler"> 149 <div class="menu-toggler sidebar-toggler">
150 </div> 150 </div>
151 </div> 151 </div>
src/main/resources/static/login.html
@@ -180,7 +180,7 @@ h3.logo-text{ @@ -180,7 +180,7 @@ h3.logo-text{
180 <div class="wrapper ng-scope"> 180 <div class="wrapper ng-scope">
181 <div id="loginPanel" class="dialog dialog-shadow"> 181 <div id="loginPanel" class="dialog dialog-shadow">
182 <br> 182 <br>
183 - <h3 class="logo-text">闵行公交调度系统 </h3> 183 + <h3 class="logo-text">青浦公交调度系统 </h3>
184 <hr> 184 <hr>
185 <form style="padding: 0px 35px;"> 185 <form style="padding: 0px 35px;">
186 <div class="form-group" style="margin-bottom: 0"> 186 <div class="form-group" style="margin-bottom: 0">
src/main/resources/static/pages/control/line/index.html
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="portlet-title banner" > 18 <div class="portlet-title banner" >
19 <div class="caption col_hide_1280" style="color: #FFF;"> 19 <div class="caption col_hide_1280" style="color: #FFF;">
20 <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span 20 <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
21 - class="caption-subject bold" style="font-size: 24px;">闵行公交线路调度系统</span> 21 + class="caption-subject bold" style="font-size: 24px;">青浦公交线路调度系统</span>
22 </div> 22 </div>
23 <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;"> 23 <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
24 <span class="top_username"></span> <span class="operation_mode_text animated" ></span> 24 <span class="top_username"></span> <span class="operation_mode_text animated" ></span>