Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 7413d94f 9b4ac9aa
Showing 26 changed files with 355 additions and 168 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forms/mould/waybill_qingpu.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_range_turn.html
src/main/resources/static/real_control_v2/js/home/line_panel.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/signal_state/signal_state.js
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
@@ -29,7 +29,7 @@ public class Constants {
 	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
 	//车载网关上行接口
-	public static final String UPSTREAM_URL = "/control/upstream/";
+	public static final String UPSTREAM_URL = "/control/upstream";
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
@@ -242,7 +242,11 @@ public class GeoCacheData {
         List<Map<String, Object>> speedMap = jdbcTemplate.queryForList(sql);
         Map<String, Double> speedTempMap = new HashMap<>();
         for (Map<String, Object> tMap : speedMap) {
-            speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
+            try {
+                speedTempMap.put(tMap.get("LINE_CODE").toString(), Double.parseDouble(tMap.get("SPEEDING").toString()));
+            } catch (NumberFormatException e) {
+                logger.error("speeding is null...");
+            }
         }
         speedLimitMap = speedTempMap;
     }
@@ -135,7 +135,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
         else if(sch.getBcType().equals("out")){
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-            if(prev.getStopNo().equals(next.getQdzCode())){
+            if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
                 dayOfSchedule.addExecPlan(next);
                 outStation(gps, prev);
@@ -35,11 +35,11 @@ public class Ylxxb {
 	private Date xgrq;
 	private String xgr;
 	private String fromgsdm;
-	private int nylx;
+	private Integer nylx;
 	@Transient
 	private String ldgh;
 	//0为接口数据，1为手工输入
-	private int jylx=0;
+	private Integer jylx=0;
 	@Transient
 	private String gsname;
 	@Transient
@@ -27,4 +27,12 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
+	@Transactional
+	@Modifying
+	@Query(value="select * from bsth_c_ylxxb s where s.nbbm = ?1 and "
+			+ "to_days(s.yyrq) = to_days(?2)",nativeQuery=true)
+	List<Ylxxb> queryListYlxxb(String clZbh,String date);
+	
+	
+	
 }
@@ -39,12 +39,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="select t.car_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
-			+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+	@Query(value="select t.inside_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
+			+ "  select equipment_code,inside_code  from bsth_c_cars where id in("
 			+ " select cl from bsth_c_s_ccinfo where  xl in ( "
 			+ " select id from bsth_c_line where line_code=?1 ))) t"
 			+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
-			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like %?4% ",nativeQuery=true)
+			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.inside_code like %?4% ",nativeQuery=true)
 	List<Object[]> historyMessage(String line,long d,long t,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
@@ -74,7 +74,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
+	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code like %?3%",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
@@ -8,10 +8,7 @@ import com.bsth.util.RequestUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -26,7 +23,7 @@ import java.util.Map;
  * @date 2016年3月24日 上午11:49:20 
  *
  */
-public class LoginInterceptor extends BaseFilter{
+public class LoginInterceptor extends BaseFilter {
 	@Override
 	public void destroy() {
@@ -34,16 +31,19 @@ public class LoginInterceptor extends BaseFilter{
 	}
 	@Override
-	public void doFilter(ServletRequest arg0, ServletResponse arg1,
-			FilterChain arg2) throws IOException, ServletException {
-		
+	public void init(FilterConfig filterConfig) throws ServletException {
+
+	}
+
+	@Override
+	public void doFilter(HttpServletRequest request,
+						 HttpServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
 		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-		
+
 		if(null == authentication){
 			//没有登录
-			HttpServletRequest request = (HttpServletRequest)arg0;
-			HttpServletResponse response = ((HttpServletResponse)arg1);
-			
+
 			if(RequestUtils.isAjaxRequest(request)){
 				Map<String, Object> map = new HashMap<>();
 				map.put("status",
@@ -52,10 +52,11 @@ public class LoginInterceptor extends BaseFilter{
 			}
 			else
 				response.sendRedirect(Constants.LOGIN_PAGE);
-			
+
 			return;
 		}
-		
-		arg2.doFilter(arg0, arg1);
+
+		chain.doFilter(request, response);
 	}
+
 }
@@ -15,6 +15,7 @@ import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -25,6 +26,7 @@ import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.realcontrol.SvgAttributeRepository;
@@ -99,6 +101,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     DutyEmployeeService dutyEmployeeService;
+    
+    @Autowired
+    YlxxbRepository ylxxbRepository;
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -502,6 +507,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				map = new HashMap<String, Object>();
 				try {
+					scheduleRealInfo.setjName(scheduleRealInfo.getjGh()+scheduleRealInfo.getjName());
+					scheduleRealInfo.setsName(scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
 					map = rru.getMapValue(scheduleRealInfo);
 					String zdsj = scheduleRealInfo.getZdsj();
 					String zdsjActual = scheduleRealInfo.getZdsjActual();
@@ -2433,6 +2440,25 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						try {
 							scheduleRealInfo.setBcs(xyz);
 							xyz++;
+							Set<ChildTaskPlan> cs = scheduleRealInfo.getcTasks();
+							Double sjlc=0.0;
+							if(!cs.isEmpty()){
+								Iterator<ChildTaskPlan> it = cs.iterator();
+								while(it.hasNext()){
+									ChildTaskPlan c = it.next();
+										if(!c.isDestroy()){
+											sjlc += c.getMileage()==null?0:c.getMileage();
+										}
+									
+								}
+							}else{
+								if(scheduleRealInfo.getStatus() != -1){
+									sjlc =scheduleRealInfo.getJhlc();
+								}
+							}
+							scheduleRealInfo.setjName(scheduleRealInfo.getjGh()+scheduleRealInfo.getjName());
+							scheduleRealInfo.setsName(scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
+							scheduleRealInfo.setSjlc(format.format(sjlc));
 							map = rru.getMapValue(scheduleRealInfo);
 							String zdsj = scheduleRealInfo.getZdsj();
 							String zdsjActual = scheduleRealInfo.getZdsjActual();
@@ -2457,8 +2483,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			}
 		}
+		
+		List<Ylxxb> listYlxxb=ylxxbRepository.queryListYlxxb( clZbh, date);
+		Double jzl=0.0;
+		for(int t=0;t<listYlxxb.size();t++){
+			Ylxxb y=listYlxxb.get(t);
+			jzl += y.getJzl();
+		}
+		
 		//计算里程和班次数，并放入Map里
 		map = new HashMap<String, Object>();
+		map.put("jzl", jzl);
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
 		map.put("ssgl", format.format(remMileage));
@@ -2632,7 +2667,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				while(it.hasNext()){
 					ChildTaskPlan c = it.next();
 					if(c.getRemarks()!=null && c.getRemarks().length()>0){
-						remarks += c.getRemarks();
+						if(remarks.indexOf(c.getRemarks())==-1){
+							remarks += c.getRemarks();
+						}
 					}
 						if(!c.isDestroy()){
@@ -2664,7 +2701,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				String xlbm=s.getXlBm();
 				String fcrq=s.getScheduleDateStr();
-				
+				List<Ylxxb> listYlxxb=ylxxbRepository.queryListYlxxb( s.getClZbh(), fcrq);
+				Double jzl=0.0;
+				for(int t=0;t<listYlxxb.size();t++){
+					Ylxxb y=listYlxxb.get(t);
+					jzl += y.getJzl();
+				}
+				map.put("jzl", jzl);
 				map.put("xlName", s.getXlName());
 				map.put("clZbh", s.getClZbh());
 				map.put("fcsjActual", s.getFcsjActual());
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root
 \ No newline at end of file
+ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -158,31 +158,31 @@
 							<td colspan="40">&nbsp;</td>
 						</tr> -->
 						<tr>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
 							<td>司晚</td>
 							<td>售晚</td>
-							<td colspan="2">班序</td>
+							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
 							<td>司早</td>
 							<td>售早</td>
@@ -307,8 +307,8 @@
 	{{each list as obj i}}
 		<tr>
 			<td>{{i+1}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{obj.sGh}}{{obj.sName}}</td>
 			<td>&nbsp;</td>
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</td>
@@ -252,7 +252,7 @@
       </tr>
       <tr>
           <td colspan="2">出场存油 &nbsp;升</td>
-          <td colspan="3">加注油量 &nbsp;升</td>
+          <td colspan="3">加注油量 {{map.jzl}}升</td>
           <td colspan="2">进场存油 &nbsp;升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
           <td colspan="5">本日耗油 &nbsp;升</td>
@@ -298,8 +298,8 @@
 		<tr>
 			<td>{{i+1}}</td>
 			<td>{{obj.lpName}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{obj.sGh}}{{obj.sName}}</td>
 			<td>&nbsp;</td>
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</td>
@@ -350,8 +350,8 @@
 		<td>{{map.ljgl}}</td>
 		<td colspan="2">损失班次</td>
 		<td colspan="1">{{map.ssbc}}</td>
-		<td colspan="3">运送公里</td>
-		<td colspan="2">{{map.ysgl}}</td>
+		<td colspan="3"></td>
+		<td colspan="2"></td>
 	</tr>
 	<tr>
@@ -396,7 +396,7 @@
                                 name: '出场'
                             },
                             'add_sub_task_range_turn': {
-                                name: '区间掉头'
+                                name: '区间调头'
                             },
                             'add_sub_task_other': {
                                 name: '自定义'
@@ -2,14 +2,14 @@
     <div class="uk-modal-dialog" style="width: 1200px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>区间掉头子任务</h2></div>
+            <h2>区间调头子任务</h2></div>
         <div style="width: 100%;padding-left: 1%;">
             <form class="uk-form uk-form-horizontal">
                 <div class="uk-grid">
                     <div class="uk-width-1-4">
                         <div class="uk-form-row" style="margin-top: 20px;">
-                            <label class="uk-form-label">掉头站点</label>
+                            <label class="uk-form-label">调头站点</label>
                             <div class="uk-form-controls">
                                 <select id="turnStationSelect">
                                     <option value="">请选择...</option>
@@ -19,7 +19,7 @@
                     </div>
                     <div class="uk-width-1-4">
                         <div class="uk-form-row" style="margin-top: 20px;">
-                            <label class="uk-form-label">掉头原因</label>
+                            <label class="uk-form-label">调头原因</label>
                             <div class="uk-form-controls">
                                 <select id="turnReason" style="width: calc(100% - 9px);">
                                     <option value="">请选择...</option>
@@ -29,7 +29,7 @@
                     </div>
                     <div class="uk-width-2-4" style="padding-left: 28px;">
                         <h6 style="color: #a7a5a5;margin-top: 35px;"><i class="uk-icon-question-circle"> </i>
-                            如果“掉头站点”在另一个走向不存在，你需要手动选择第二个营运起点</h6>
+                            如果“调头站点”在另一个走向不存在，你需要手动选择第二个营运起点</h6>
                     </div>
                 </div>
             </form>
@@ -343,7 +343,7 @@
                                 /**
                                  * 为班次添加备注
                                  */
-                                var remarks = '掉头' + $('[name=endDate]', csf).val() + ' 因 ' + $('#turnReason', modal).val() + '在' + $('[name=endStation] option:selected', csf).text() + '掉头';
+                                var remarks = '调头' + $('[name=endDate]', csf).val() + ' 因 ' + $('#turnReason', modal).val() + '在' + $('[name=endStation] option:selected', csf).text() + '调头';
                                 gb_schedule_table.addRemarks([sch, nextSch], remarks);
                                 UIkit.modal(modal).hide();
                                 $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
@@ -368,7 +368,7 @@
                 //submit
                 $('#submitChildTaskBtn', modal).on('click', function () {
                     if ($('#turnReason', modal).val() == '') {
-                        return notify_err('你必须选择掉头原因！');
+                        return notify_err('你必须选择调头原因！');
                     }
                     $(this).addClass('disabled').attr('disabled', 'disabled');
@@ -377,7 +377,7 @@
                     fs.formValidation('validate');
                 });
-                //掉头站切换
+                //调头站切换
                 $('#turnStationSelect', modal).on('change', function () {
                     turnStation = $(this).val();
                     turnStationName = $('option:selected', this).text();
@@ -122,7 +122,7 @@ var gb_home_line_panel = (function() {
     var $t = function(e) {
         return $(e).text();
-    }
+    };
     function groupByLineAndUpDown(list) {
         var rs = {},
@@ -45,8 +45,10 @@ var gb_main_ep = new EventProxy(),
             //初始化gps异常判定
             gb_gps_abnormal.initData();
-            //嵌入地图页面
-            $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
+            setTimeout(function () {
+                //嵌入地图页面
+                $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
+            }, 1000);
             //弹出更新说明
             //showUpdateDescription();
         });
@@ -10,7 +10,7 @@ var gb_signal_state = (function () {
     });
     var signal_state_data = {};
-    var enable = true;
+    var enable = false;//true;
     //读取本地状态
     var locStatus = storage.getItem("signal_state_enable");
     if (locStatus && locStatus=='0')
@@ -28,10 +28,10 @@ input[type=checkbox].disabled{
     overflow: hidden;
     left: auto;
     top: 3px;
-    box-shadow: none;
-    border-radius: 5px 0 0 5px;
+    border-radius: 9px 0 0 9px;
     border: 1px solid #dedede;
     border-right: none;
+    box-shadow: none;
 }
 .map-system-msg.flex-left a:before{
@@ -119,14 +119,16 @@ input[type=checkbox].disabled{
 .real_right_gps_panel>form{
     text-align: center;
     margin-top: 20px;
+    position: relative;
 }
-.real_right_gps_panel>form>div.uk-form-icon{
-    width: 88%;
+.real_right_gps_panel>form div.uk-form-icon{
+    width: 100%;
 }
-.real_right_gps_panel>form>div.uk-form-icon input{
-    width: 100%;
+.real_right_gps_panel>form div.uk-form-icon input{
+    width: calc(100% - 30px);
+    font-size: 12px;
 }
 .real_right_gps_panel>form>div.uk-form-icon input::-webkit-input-placeholder{
@@ -134,22 +136,12 @@ input[type=checkbox].disabled{
 }
 .real_right_gps_panel .gps_tree_list{
-    height: calc(100% - 80px);
+    height: calc(100% - 70px);
     overflow: auto;
-    padding: 20px 0 0 32px;
+    padding: 15px 0 0 32px;
 }
-/*.real_bottom_panel{
-    width: 100%;
-    background: red;
-    height: 100px;
-    position: fixed !important;
-    top: auto !important;
-    bottom: 0 !important;
-    left: 0;
-    right: 0;
-}
-*/
+
 .real_bottom_panel #handle{
     width: 100%;
     height: 4px;
@@ -562,13 +554,47 @@ input[type=checkbox].disabled{
     margin-left: -5px;
 }
-/*
-.pb_log_item>div{
-    display: inline-block;
-}*/
+.gps_tree_abnormal{
+    font-size: 11px;
+    padding: 0 1px 0 2px;
+    border-radius: 3px;
+    margin-left: 2px;
+}
-/*
-.pb_tools_icon i:hover{
-    color: #787676;
-    box-shadow: 1px 0px 5px 0 rgba(0,0,0,0.16), -1px 0px 10px 0 rgba(0,0,0,0.12);
-}*/
+.gps_tree_abnormal.overspeed{
+    background: #ff3232;
+    color: white;
+}
+
+.gps_tree_abnormal.outBounds{
+    background: #ffff00;
+    color: #787777;
+}
+
+.gps_tree_abnormal.overspeed:hover{
+    background: #e37878;
+    color: white;
+}
+
+.gps_tree_abnormal.outBounds:hover{
+    background:#fdfd00;
+    color: #595959;
+}
+
+.real_right_gps_panel .ral-gps-autocom .uk-dropdown{
+    margin-left: 15px;
+    width: 240px;
+    text-align: left;
+}
+
+.uk-autocomplete-results.ral-gps-autocom-results{
+
+}
+
+.uk-autocomplete-results.ral-gps-autocom-results .desc{
+    color: #8e8e8e;
+}
+
+.uk-nav-autocomplete>li.uk-active>a .desc{
+    color: #fff;
+}
 \ No newline at end of file
@@ -142,7 +142,7 @@ var gb_map_config = (function () {
     //标识角度
     function carIcon_angle(val) {
         defaultConfig.carIcon.angle=this.checked;
-        gb_map_overlay_mge.reDraw();
+        gb_map_overlay_mge.reDrawGps();
     }
     function recursion_get_attr(data, attr) {
@@ -7,7 +7,9 @@ var gb_map_gps_tree = (function () {
     var jstreeChanged = function (e, node, event) {
         gb_map_overlay_mge.refresh();
     };
-    
+
+    var readyStatus;
+
     var init = function (cb) {
         var allGps = gb_data_gps.allGps;
         _devices = gb_common.get_keys(allGps);
@@ -16,7 +18,7 @@ var gb_map_gps_tree = (function () {
         treeObj = $('.real_right_gps_panel .gps_tree_list')
         //节点初始化完成
             .on('ready.jstree', function () {
-                treeObj.jstree(true).open_all();
+                //treeObj.jstree(true).open_all();
                 //删掉tree node a标签的 href值（避免鼠标悬停浏览器出现状态条）
                 $('.gps_tree_list .jstree-container-ul a.jstree-anchor').removeAttr('href');
             })
@@ -24,6 +26,7 @@ var gb_map_gps_tree = (function () {
             .on('state_ready.jstree', function () {
                 //绑定checkbox状态切换事件
                 treeObj.on('check_node.jstree uncheck_node.jstree', jstreeChanged);
+                readyStatus = true;
                 cb && cb();
             })
             .on('activate_node.jstree', function (e, n) {
@@ -43,28 +46,12 @@ var gb_map_gps_tree = (function () {
                     'keep_selected_style': false,
                     'whole_node': false,
                     'tie_selection': false
-                }/*,
-                'contextmenu': {
-                    'items': {
-                        '轨迹回放': {
-                            'label': '轨迹回放',
-                            'action': function (data) {
-                                console.log('action', data);
-                            }
-                        },
-                        '发送指令': {
-                            'label': '发送指令',
-                            'action': function (data) {
-                                console.log('action', data);
-                            }
-                        }
-                    }
-                }*/,
+                },
                 //local storage里的key
                 'state': {
                     'key': 'jstree_map_devices'
                 },
-                'plugins': ['checkbox'/*, 'contextmenu'*/, 'state']
+                'plugins': ['checkbox', 'state']
             });
     };
@@ -106,7 +93,7 @@ var gb_map_gps_tree = (function () {
                 });
             }
         })();
-    }
+    };
     //创建线路和上下行节点
     var create_route_node = function (lineCode, cb) {
@@ -133,7 +120,7 @@ var gb_map_gps_tree = (function () {
                 }
             }]
         }, 'last', cb);
-    }
+    };
     var appendDeviceNode = function (routeNode, gps, cb) {
         if (!routeNode) {
@@ -150,16 +137,124 @@ var gb_map_gps_tree = (function () {
             'data': {lineId: gps.lineId, upDown: gps.upDown},
             'icon': 'uk-icon-bus'
         }, 'last', cb);
-    }
+    };
+
+    /**
+     * 上下行改变
+     * @param changeArray
+     */
+    var changeUpDown = function (changeArray) {
+        console.log('changeUpDown', changeArray);
+    };
+
+    /**
+     * 更新节点
+     */
+    var abnormalsMapp = {
+        'outBounds': '越界',
+        'overspeed': '超速'
+    };
+    var update_node = function (ups) {
+        var tree = treeObj.jstree(true)
+            ,node,suffix;
+        $.each(ups, function () {
+            node = tree.get_node('map_tree_device_' + this.nbbm);
+            suffix=abnormalsMapp[this['abnormalStatus']];
+            suffix = suffix?'<a class="gps_tree_abnormal '+this['abnormalStatus']+'">'+suffix+'</a>':'';
+            tree.set_text(node, this.nbbm + suffix);
+        });
+    };
+
+
+    /**
+     * 搜索
+     */
+    var autocom = '.real_right_gps_panel .ral-gps-autocom'
+        ,_input = $('input', autocom);
+
+    var autocomplete_source = function(release) {
+        var rs = [],
+         v = _input.val().toUpperCase(), count=0;
+
+        $.each(gb_common.get_vals(gb_data_gps.allGps), function () {
+            if(this.nbbm.indexOf(v) != -1){
+                rs.push({
+                    value: this.nbbm,
+                    lineName: '青浦1路',
+                    stationName: this.stationName?this.stationName:'',
+                    dateStr: this.dateStr
+                });
+                count++;
+            }
+            if(count > 11)
+                return false;
+        });
+        release && release(rs);
+    };
+
+    var selectitem = function (event, data, acobject) {
+        //var deviceId = gb_data_basic.nbbm2deviceMap()[data.value];
+        //gb_map_imap.call('drawRealGpsMarker', {gpsList: [gb_data_gps.findOne(deviceId)]});
+        //地图定位
+        //gb_map_overlay_mge._focus(gb_data_basic.nbbm2deviceMap()[data.value]);
+
+        var tree = treeObj.jstree(true)
+        var deviceId = gb_data_basic.nbbm2deviceMap()[data.value]
+            ,gps = gb_data_gps.findOne(deviceId);
+
+        //展开线路节点
+        tree.open_node(tree.get_node('map_tree_line_' + gps.lineId), function () {
+            //展开走向节点
+            tree.open_node(tree.get_node('map_tree_route_' + gps.lineId + '_' + gps.upDown), function () {
+                //选中车辆
+                var id = 'map_tree_device_' + data.value;
+                var node = tree.get_node(id);
+                tree.check_node(node);
+
+                var $e = $('#'+id);
+                treeObj.animate({
+                    scrollTop: $e.offset().top - treeObj.offset().top + treeObj.scrollTop()
+                }, 500);
+                //地图定位
+                gb_map_overlay_mge._focus(gb_data_basic.nbbm2deviceMap()[data.value]);
+            }, false);
+        });
+    };
+    var result_template = '<script type="text/autocomplete">' +
+            '  <ul class="uk-nav uk-nav-autocomplete uk-autocomplete-results ral-gps-autocom-results">' +
+            '      {{~items}}' +
+            '      <li data-value="{{ $item.value }}">' +
+            '          <a>' +
+            '              {{ $item.value }} <small class="desc"> {{ $item.stationName }}</small>' +
+            '               <div class="desc"><span>{{$item.dateStr}}</span></div>' +
+            '          </a>' +
+            '      </li>' +
+            '      {{/items}}' +
+            '  </ul>' +
+            '</script>';
+
+    $(autocom).append(result_template);
+    UIkit.autocomplete(autocom, {
+        minLength: 1,
+        delay: 10,
+        source: autocomplete_source
+    }).on('selectitem.uk.autocomplete', selectitem);
+
+
     return {
         init: init,
+        readyStatus: function () {
+            return readyStatus;
+        },
         getChecked: function () {
             return treeObj.jstree(true).get_checked(true);
         },
         all_devices: function () {
             return _devices;
         },
-        create_node: create_node
+        create_node: create_node,
+        changeUpDown: changeUpDown,
+        update_node: update_node
     };
 })();
 \ No newline at end of file
@@ -92,7 +92,7 @@ var gb_map_imap = (function () {
         var canvas = $('<canvas></canvas>')[0];
         canvas.width = w;
-        canvas.height = 75;
+        canvas.height = 64;
         var ctx = canvas.getContext('2d');
         var colours = color(gps);
@@ -101,13 +101,13 @@ var gb_map_imap = (function () {
         //ctx.shadowBlur = 1; // 模糊尺寸
         //ctx.shadowColor = colours.shadow; // 颜色
-        ctx.roundRect(0, 0, w, 24, 5).stroke();
+        ctx.roundRect(0, 0, w, 19, 4).stroke();
         ctx.fillStyle = colours.bgColor;
         ctx.fill();
         //文字
         ctx.font = "14px arial";
         ctx.fillStyle = "#fff";
-        ctx.fillText(gps.nbbm, 2, 17);
+        ctx.fillText(gps.nbbm, 2, 14);
         //角度图标
         var img = new Image();
@@ -179,6 +179,12 @@ var gb_map_baidu = (function(){
 			carparks = {};
 			map.clearOverlays();
 		},
+		clearAllGps: function () {
+			$.each(gb_common.get_vals(realMarkers), function () {
+				map.removeOverlay(this);
+			});
+			realMarkers = {};
+		},
 		showGpsMarker:function (opt) {
 			var chs = opt.chs;
 			for(var device in realMarkers){
@@ -203,6 +209,8 @@ var gb_map_baidu = (function(){
 			var deviceId = opts.deviceId
 				,m = realMarkers[deviceId];
 			if(m){
+				if(!m.isVisible())
+					m.show();
 				map.panTo(m.point, {noAnimation: true});
 				//setTop(m);
 			}
@@ -336,9 +344,9 @@ var gb_map_baidu = (function(){
 		//如果需要标识角度
 		if(config.carIcon.angle)
-			marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gpsData, w), new BMap.Size(w,75)));
+			marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gpsData, w), new BMap.Size(w,70)));
 		else
-			marker.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gpsData, w), new BMap.Size(w,25)));
+			marker.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gpsData, w), new BMap.Size(w,20)));
 	}
 	function createStationMark(statio) {
@@ -348,7 +356,7 @@ var gb_map_baidu = (function(){
 		//根据站点名称 计算marker 宽度
 		var w = statio.stationName.length * 12 + 4
 			,iw=w-2;
-		var icon = new BMap.Icon(gb_map_imap.createStationIcon(statio, w), new BMap.Size(iw,20), {anchor: new BMap.Size(iw/2,20)})
+		var icon = new BMap.Icon(gb_map_imap.createStationIcon(statio, w), new BMap.Size(iw,24), {anchor: new BMap.Size(iw/2,24)})
 		marker.setIcon(icon);
 		//信息窗口
@@ -63,6 +63,10 @@ var gb_map_gaode = (function() {
 			carparks={};
 			map.clearMap();
 		},
+		clearAllGps: function () {
+			map.remove(gb_common.get_vals(realMarkers));
+			realMarkers = {};
+		},
 		drawLine: function(opt){
 			if(polylines[opt.id])
 				return;
@@ -331,17 +335,17 @@ var gb_map_gaode = (function() {
 		//如果需要标识角度
 		if(config.carIcon.angle) {
 			marker.setIcon(new AMap.Icon({
-				size: new AMap.Size(w, 75),  //图标大小
+				size: new AMap.Size(w, 70),  //图标大小
 				image: gb_map_imap.createCarIconRotation(gps, w)
 			}));
 			marker.setOffset(new AMap.Pixel(-(w / 2), -35));
 		}
 		else{
 			marker.setIcon(new AMap.Icon({
-				size: new AMap.Size(w, 25),  //图标大小
+				size: new AMap.Size(w, 20),  //图标大小
 				image: gb_map_imap.createCarIcon(gps, w)
 			}));
-			marker.setOffset(new AMap.Pixel(-(w / 2), -12.5));
+			marker.setOffset(new AMap.Pixel(-(w / 2), -10.5));
 		}
 	}
@@ -354,10 +358,10 @@ var gb_map_gaode = (function() {
 			map: map,
 			position: [statio.gcj_lon, statio.gcj_lat],
 			icon: new AMap.Icon({
-				size: new AMap.Size(w, 20),  //图标大小
+				size: new AMap.Size(w, 24),  //图标大小
 				image: gb_map_imap.createStationIcon(statio, w)
 			}),
-			offset: new AMap.Pixel(-(w/2), -20)
+			offset: new AMap.Pixel(-(w/2), -24)
 		});
 		//信息窗口
@@ -11,25 +11,22 @@ var gb_map_overlay_mge = (function () {
         //如果地图正在重绘，暂时不刷新GPS
         if(reDrawing)
             return;
-        var all = addArr.concat(upArr).concat(upDownChange);
-        gpsRefreshAll(all);
+        //var all = addArr.concat(upArr).concat(upDownChange);
+        gpsRefreshAll(addArr, upArr, upDownChange);
     };
-    var gpsRefreshAll = function (allList) {
-        //是否需要添加樹節點
-        var newTreeNodes=[], currArray=gb_map_gps_tree.all_devices();
-        $.each(allList, function () {
-            if(currArray.indexOf(this.deviceId) == -1)
-                newTreeNodes.push(this);
-        });
-
-        gb_map_imap.call('drawRealGpsMarker', {gpsList: allList});
-
-        //有新设备上线
-        if(newTreeNodes.length > 0){
-            gb_map_gps_tree.create_node(newTreeNodes, showOverlayByChecks);
+    var gpsRefreshAll = function (addArr, upArr, upDownChange) {
+        //更新设备树菜单
+        if(gb_map_gps_tree.readyStatus()){
+            gb_map_gps_tree.create_node(addArr);
+            gb_map_gps_tree.update_node(upArr);
+            gb_map_gps_tree.changeUpDown(upDownChange);
         }
+
+        //更新地图
+        var all = addArr.concat(upArr).concat(upDownChange);
+        gb_map_imap.call('drawRealGpsMarker', {gpsList: all});
     };
     var deviceFilter = function (node) {
@@ -83,15 +80,26 @@ var gb_map_overlay_mge = (function () {
         gb_map_imap.call('clearAll');
         drawAllSection();
-        //初始绘制
-        gpsRefreshAll(gb_common.get_vals(gb_data_gps.allGps));
+        //重绘GPS
+        gb_map_imap.call('drawRealGpsMarker', {gpsList: gb_common.get_vals(gb_data_gps.allGps)});
         showOverlayByChecks();
         //显示路段
         showSection(getCheckedDevice());
         reDrawing = false;
-    }
+    };
+
+    //重绘GPS
+    var reDrawGps = function () {
+        reDrawing = true;
+        gb_map_imap.call('clearAllGps');
+        //重绘GPS
+        gb_map_imap.call('drawRealGpsMarker', {gpsList: gb_common.get_vals(gb_data_gps.allGps)});
+
+        showOverlayByChecks();
+        reDrawing = false;
+    };
     var init = function () {
         reDraw();
@@ -102,7 +110,7 @@ var gb_map_overlay_mge = (function () {
         centerToRational();
     };
-    
+
     var showOverlayByChecks = function () {
         var chs = getCheckedDevice(),chsMap={};
         $.each(chs, function () {
@@ -115,7 +123,7 @@ var gb_map_overlay_mge = (function () {
         showSection(chs);
     };
-    
+
     var _focus = function (deviceId) {
         gb_map_imap.call('goToMarker', {deviceId: deviceId});
         //打开信息窗口
@@ -125,14 +133,14 @@ var gb_map_overlay_mge = (function () {
     //站点获得焦点
     var _focus_station = function (station) {
         gb_map_imap.call('goToStation', station.stationCode);
-    }
+    };
     //停车场获得焦点
     var _focus_carpark = function (carpark) {
         //console.log('_focus_carpark', carpark);
         gb_map_imap.call('goToCarpark', carpark.parkCode);
-    }
-    
+    };
+
     function getCheckedDevice() {
         return gb_map_gps_tree.getChecked().filter(deviceFilter);
     }
@@ -144,7 +152,7 @@ var gb_map_overlay_mge = (function () {
         gb_map_imap.call('drawStationMarker', {list: list});
         //绘制电子围栏
         drawElectronicFence(list);
-    }
+    };
     //绘制电子围栏
     var drawElectronicFence = function (list) {
@@ -162,13 +170,13 @@ var gb_map_overlay_mge = (function () {
             fun=this.shapesType=='r'?drawCircle:drawPolygon;
             fun(this);
         });
-    }
+    };
     //绘制停车场
     var drawCarpark = function () {
         var list = gb_map_spatial_data.gteCheckedCarpark();
         gb_map_imap.call('drawCarpark', {list: list});
-    }
+    };
     var drawCircle=function (data) {
         var config = gb_map_config.getConfig().section.color;
@@ -185,7 +193,7 @@ var gb_map_overlay_mge = (function () {
         };
         gb_map_imap.call('drawCircle', opt);
-    }
+    };
     var drawPolygon=function (data) {
         var config = gb_map_config.getConfig().section.color;
@@ -199,7 +207,7 @@ var gb_map_overlay_mge = (function () {
         };
         gb_map_imap.call('drawPolygon', opt);
-    }
+    };
     //地图居中至合理的位置
     var centerToRational=function () {
@@ -208,8 +216,8 @@ var gb_map_overlay_mge = (function () {
             var id=chs[0].data.lineId+'_'+chs[0].data.upDown;
             gb_map_imap.call('centerToLine', {id: id});
         }
-    }
-    
+    };
+
     return {
         init: init,
         refresh: showOverlayByChecks,
@@ -226,6 +234,7 @@ var gb_map_overlay_mge = (function () {
             return temps['map-win-carpark-detail-temp'](data);
         },
         reDraw: reDraw,
+        reDrawGps: reDrawGps,
         getCheckedDevice: getCheckedDevice,
         drawStation: drawStation,
         drawElectronicFence: drawElectronicFence,
@@ -5,31 +5,18 @@
 <link rel="stylesheet" href="/real_control_v2/mapmonitor/css/real.css"/>
 <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css">
-<div class="map-system-msg">
-    <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank">
-        当前地图模块正在维护升级中，请点这里打开原版地图
-
-        <i class="uk-icon-close map-system-msg-close"></i>
-    </a>
+<div class="map-system-msg flex-left">
+    <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
 </div>
-<script>
-    $('.map-system-msg-close').on('click', function (e) {
-        e.stopPropagation();
-        $('.map-system-msg').addClass('flex-left');
-        return false;
-    });
-    
-    setTimeout(function () {
-        $('.map-system-msg-close').trigger('click');
-    }, 2000);
-</script>
 <div id="real_map_container"></div>
 <div class="real_right_gps_panel">
-    <form class="uk-form" data-uk-margin="">
-        <div class="uk-form-icon">
-            <i class="uk-icon-search"></i>
-            <input type="text" placeholder="搜索..." disabled>
+    <form class="uk-form" >
+        <div class="uk-autocomplete uk-form ral-gps-autocom" style="width: 100%;">
+            <div class="uk-form-icon">
+                <i class="uk-icon-search"></i>
+                <input type="text" placeholder="搜索...">
+            </div>
         </div>
     </form>
@@ -40,7 +27,7 @@
     <!--<div id="handle" class="ui-resizable-handle ui-resizable-n"></div>-->
     <div class="real_br_cont map_config_wrap"></div>
     <div class="telescopic">
-        <i class="uk-icon-angle-double-up" ></i>
+        <i class="uk-icon-angle-double-up"></i>
     </div>
 </div>