update...

潘钊
1 parent 2fbadc1e
Showing 5 changed files with 40 additions and 28 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
@@ -257,7 +257,7 @@ public class BasicData {
          * @Description: TODO(加载线路相关信息)
          */
         public void loadLineInfo() {
-            Iterator<Line> iterator = lineRepository.findAll().iterator();
+            Iterator<Line> iterator = lineRepository.findAllService().iterator();
             Line line;
             BiMap<Integer, String> biMap = HashBiMap.create();
@@ -49,30 +49,34 @@ public class ScheduleRefreshThread extends Thread{
 			Collection<LineConfig> confs = lineConfs.getAll();
 			String currSchDate, oldSchDate;
-			String lineCode;
+			String lineCode = null;
 			for(LineConfig conf : confs){
-				lineCode = conf.getLine().getLineCode();
-				oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
-				currSchDate = dayOfSchedule.calcSchDate(lineCode);
-				
-				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+				try{
+					lineCode = conf.getLine().getLineCode();
+					oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
+					currSchDate = dayOfSchedule.calcSchDate(lineCode);
-					logger.info(lineCode + "开始翻班， " + currSchDate);
+					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
-					try{
-						//清除指令数据
-						Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
-						for(String car : cars)
-							dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
-						//清除驾驶员上报数据
-						pilotReport.clear(lineCode);
-					}catch (Exception e){
-						logger.error("清理 60 和 80出现问题", e);
+						logger.info(lineCode + "开始翻班， " + currSchDate);
+
+						try{
+							//清除指令数据
+							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
+							for(String car : cars)
+								dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
+							//清除驾驶员上报数据
+							pilotReport.clear(lineCode);
+						}catch (Exception e){
+							logger.error("清理 60 和 80出现问题", e);
+						}
+
+						//重载排班数据
+						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
+						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
 					}
-					
-					//重载排班数据
-					dayOfSchedule.reloadSch(lineCode, currSchDate, false);
-					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+				}catch (Exception e){
+					logger.error("班次更新失败！！ -" + lineCode, e);
 				}
 			}
@@ -41,4 +41,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
+
+	@Query("SELECT L FROM Line L where L.destroy=0")
+	List<Line> findAllService();
 }
@@ -16,8 +16,6 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
-import com.bsth.util.PageHelper;
-import com.bsth.util.PageObject;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
@@ -985,11 +983,18 @@ public class GpsServiceImpl implements GpsService {
     public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
         try {
+            String fv, v;
             for (Field f : fs) {
                 if (StringUtils.isEmpty(map.get(f.getName()).toString()))
                     continue;
-                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                if(f.get(obj) == null)
+                    return false;
+
+                fv = f.get(obj).toString();
+                v = map.get(f.getName()).toString();
+
+                if(!fv.startsWith(v) && !fv.endsWith(v))
                     return false;
             }
         } catch (Exception e) {
@@ -7,12 +7,12 @@
         <div class="uk-panel uk-panel-box uk-panel-box-primary">
             <form class="uk-form search-form">
                 <fieldset data-uk-margin>
-                    <legend>
+                    <!--<legend>
                         数据检索
-                        <!-- <div class="legend-tools">
+                        &lt;!&ndash; <div class="legend-tools">
                     <a class="uk-icon-small uk-icon-hover uk-icon-file-excel-o" data-uk-tooltip title="导出excel"></a>
-                  </div> -->
-                    </legend>
+                  </div> &ndash;&gt;
+                    </legend>-->
                     <span class="horizontal-field">线路</span>
                     <div class="uk-autocomplete uk-form autocomplete-line" >
                         <input type="text" name="lineId" placeholder="线路">