1.在线调线路title上显示线路等级

王通
1 parent b39a2ab8
Showing 7 changed files with 107 additions and 25 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/repository/calc/CalcIntervalRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/real_control_v2/fragments/north/tabs.html
 package com.bsth.controller.realcontrol;
  
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -722,4 +723,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<RepairReport> repairReportList(@RequestParam String line, @RequestParam String date, @RequestParam String code, @RequestParam String type){
 		return scheduleRealInfoService.repairReportList(line, date, code, type);
 	}
+	
+	@RequestMapping(value = "lineLevel", method = RequestMethod.GET)
+	public Map<String, String> lineLevel(@RequestParam String idx){
+		return scheduleRealInfoService.getLevelsByLines(Arrays.asList(idx.split(",")));
+	}
 }
 package com.bsth.data;
  
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.pinyin.PersionPinYinBuffer;
-import com.bsth.entity.*;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.repository.*;
-import com.bsth.repository.schedule.CarConfigInfoRepository;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
-import java.util.*;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.pinyin.PersionPinYinBuffer;
+import com.bsth.entity.Business;
+import com.bsth.entity.CarPark;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.Personnel;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.calc.CalcInterval;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.BusinessRepository;
+import com.bsth.repository.CarParkRepository;
+import com.bsth.repository.CarsRepository;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.PersonnelRepository;
+import com.bsth.repository.StationRepository;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.calc.CalcIntervalRepository;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
  
 /**
  * @author PanZhao
@@ -77,6 +99,8 @@ public class BasicData {
     //站点名和运管处编号 对照
     public static Map<String, Integer> stationName2YgcNumber;
  
+    // 线路编码_日期 等级
+    public static Map<String, String> lineDate2Level;
  
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
  
@@ -132,7 +156,9 @@ public class BasicData {
  
         @Autowired
         PersionPinYinBuffer persionPinYinBuffer;
-
+        
+        @Autowired
+        CalcIntervalRepository calcIntervalRepository;
  
         @Override
         public void run() {
@@ -158,7 +184,9 @@ public class BasicData {
                 loadPersonnelInfo();
                 //公司信息
                 loadBusinessInfo();
-
+                // 线路等级信息
+                loadLineLevel();
+                
                 logger.info("load geo cache..，");
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
@@ -365,5 +393,30 @@ public class BasicData {
             //人员拼音转换
             persionPinYinBuffer.refresh();
         }
+        
+        /**
+         * 加载线路级别信息 按当前日期取(当前+前后一天)的数据
+         */
+        public void loadLineLevel() {
+        	List<String> dates = new ArrayList<>();
+        	Map<String, String> result = new HashMap<>();
+        	DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        	
+        	Calendar c = Calendar.getInstance();
+        	c.setTime(new Date(System.currentTimeMillis() - 86400000));
+        	dates.add(df.format(c.getTime()));
+        	
+        	for (int i = 0;i < 2;i++) {
+        		c.add(Calendar.DATE, 1);
+        		dates.add(df.format(c.getTime()));
+        	}
+        	
+        	List<CalcInterval> l = calcIntervalRepository.selectByDates(dates);
+        	for (CalcInterval ci : l) {
+        		result.put(ci.getXlBm() + "_" + ci.getDate(), ci.getLevel());
+        	}
+        	
+        	lineDate2Level = result;
+        }
     }
 }
 package com.bsth.repository.calc;
  
 import java.util.List;
-import java.util.Map;
  
-import javax.transaction.Transactional;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
  
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.repository.BaseRepository;
  
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
 /**
  * 
  */
@@ -48,5 +45,7 @@ public interface CalcIntervalRepository extends BaseRepository&lt;CalcInterval, Int
 			+ " group by  xl_bm,gsbm,fgsbm",nativeQuery=true)
 	List<Object[]> countByDateAndLine(String xlbm,String date,String date2);
  
-	
+	// 按日期查询
+	@Query(value="select c from CalcInterval c where c.date in (:dates)")
+	List<CalcInterval> selectByDates(@Param("dates")List<String> dates);
 }
@@ -199,4 +199,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> repairReport(Map<String, Object> map, boolean isActive);
  
 	List<RepairReport> repairReportList(String line,String date,String code, String type);
+	
+	Map<String, String> getLevelsByLines(List<String> lines);
 }
@@ -6428,6 +6428,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
         return result;
     }
+    
+    @Override
+    public Map<String, String> getLevelsByLines(List<String> lines) {
+    	Map<String, String> result = new HashMap<String, String>(), currSchDate = dayOfSchedule.getCurrSchDate();
+    	for (String line : lines) {
+    		String level = BasicData.lineDate2Level.get(line + "_" + currSchDate.get(line));
+    		result.put(line, level == null ? "" : level);
+    	}
+    	
+    	return result;
+    }
  
  
 	@Override
@@ -484,13 +484,12 @@
             $.each(items, function () {
                 ls_line_data.push(codeMapps[$(this).data('id')]);
             });
-            //将线路基础信息写入localStorage
-            storage.setItem('lineControlItems', JSON.stringify(ls_line_data));
             //监控模式还是主调模式
             storage.setItem('operationMode', $('.pattern_type_label>input')[0].checked?1:0);
  
             //进入线调
-            var eq = EventProxy.create('cache_route', 'check_line_config', function () {
+            var eq = EventProxy.create('cache_line_level', 'cache_mv_route', 'cache_route', 'check_line_config', function (lineLevel) {
+            	debugger;
                 var newWinOpen = $('input','.new_window_open_label')[0].checked;
                 if(!newWinOpen)
                     top.window.location.href = "/real_control/v2";
@@ -498,6 +497,13 @@
                     window.open("/real_control/v2");
                     $('#go_to_real_system_btn').html('已经尝试打开新窗口，如看不到，可能被浏览器阻止了');
                 }
+                
+                // 将线路级别赋值
+                $.each(ls_line_data, function () {
+                	this.lineLevel = lineLevel[this.lineCode];
+                });
+	            // 将线路基础信息写入localStorage
+	            storage.setItem('lineControlItems', JSON.stringify(ls_line_data));
             });
  
             //拼接线路编码
@@ -508,15 +514,20 @@
             //缓存路由
             idx=idx.substr(0, idx.length - 1);
  
-            $.ajaxSettings.async = false;
+            $.get('/realSchedule/lineLevel', {idx: idx}, function (rs) {
+                if (rs) {
+                    eq.emit('cache_line_level', rs);
+                }
+            });
+            
             $.get('/realMap/findRouteAndVersionByLine', {idx: idx}, function (rs) {
                 if (rs) {
                     for(var lineCode in rs)
                         storage.setItem(lineCode + '_route', JSON.stringify(rs[lineCode]));
-                    //eq.emit('cache_route');
+                    eq.emit('cache_mv_route');
                 }
             });
-            $.ajaxSettings.async = true;
+            
             $.get('/realMap/findRouteByLine', {idx: idx}, function (rs) {
                 if (rs) {
                     for(var lineCode in rs)
@@ -4,7 +4,7 @@
         <li class="uk-active" ><a>主页</a></li>
         <li id="north_tabs_map_btn"><a>地图</a></li>
         {{each list as line i}}
-        <li class="tab-line {{line.destroy==1?'destroy':''}}" data-code="{{line.lineCode}}"><a>{{line.name}}（<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
+        <li class="tab-line {{line.destroy==1?'destroy':''}}" data-code="{{line.lineCode}}"><a>{{line.name}}&nbsp;(<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>, <span id="level_{{line.lineCode}}">{{line.lineLevel}}</span>)</a></li>
         {{/each}}
     </ul>
   </script>