update...

潘钊
1 parent 3b0f5480
Showing 23 changed files with 349 additions and 148 deletions
src/main/java/com/bsth/Test.java
src/main/java/com/bsth/Test2.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/schedule/thread/ScheduleLateThread.java
src/main/java/com/bsth/entity/directive/D64.java
src/main/java/com/bsth/entity/directive/DC0_A4.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/forecast/util/CreateByArrivalData.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/resources/static/assets/js/common.js
src/main/resources/static/pages/control/line/child_pages/historyDirective.html
-//package com.bsth;
-//
-//import java.io.ByteArrayOutputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.OutputStream;
-//import java.net.HttpURLConnection;
-//import java.net.URL;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//import org.apache.commons.io.IOUtils;
-//
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//
-//public class Test {
-//	
-//	public static void main(String[] args) {
-//		Map<String, Object> map = new HashMap<>();
-//		map.put("timestamp", 1469764939000L);
-//		map.put("operCode", 128);
-//		map.put("deviceId", "66ML0007");
-//		
-//		Map<String , Object> dataMap = new HashMap<>();
-//		dataMap.put("requestCode", 161);
-//		dataMap.put("lineId", 1025);
-//		dataMap.put("operCode2", 38);
-//		
-//		map.put("data", dataMap);
-//		request(map, "http://192.168.168.171:9088/control/upstream");
-//		
-//	}
-//	
-//	private static Map<String, Object> request(Map<String, Object> map, String url) {
-//		InputStream in = null;
-//		OutputStream out = null;
-//		HttpURLConnection con = null;
-//		try {
-//			con = (HttpURLConnection)new URL(url).openConnection();
-//			con.setRequestMethod("POST");
-//			con.setRequestProperty("keep-alive", "true");
-//			con.setRequestProperty("accept", "*/*");
-//			con.setDoInput(true);
-//			con.setDoOutput(true);
-//			con.setReadTimeout(2500);
-//			con.setConnectTimeout(2500);
-//			out = con.getOutputStream();
-//			out.write("json=".getBytes());
-//			out.write(new ObjectMapper().writeValueAsBytes(map));
-//			out.flush();
-//			System.out.println("con.getResponseCode(): " + con.getResponseCode());
-//			if (con.getResponseCode() == 200) {
-//				in = con.getInputStream();
-//				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-//				IOUtils.copy(in, bout); bout.close();
-//				System.out.println("Message:" + new String(bout.toByteArray()));
-//				return new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-//			}
-//		} catch (IOException e) {
-//			e.printStackTrace();
-//		} finally {
-//			con.disconnect();
-//			try {
-//				if (in != null) in.close();
-//				if (out != null) out.close();
-//			} catch (IOException e) {
-//				e.printStackTrace();
-//			}
-//		}
-//		return null;
-//	}
-//}
-package com.bsth;
-
-public class Test2 {
-	
-	public static void main(String[] args) {
-		
-		for(int i = 0; i < 20; i ++){
-			new MyThread(i + "").start();
-		}
-	}
-	
-	public static class MyThread extends Thread {
-		
-		private String name ;
-		
-		public MyThread(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public void run() {
-			method(name);
-		}
-	}
-	
-	public static void method(String name){
-		System.out.println("线程" + name + "开始...");
-		int a = 0;
-		for(int i = 0; i < 1000; i ++){
-			a ++;
-		}
-		a--;
-		System.out.println("线程" + name + "结束... a = " + a);
-	}
-}
@@ -120,6 +120,15 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
         return stationRouteRepository.findStations(xlid, xldir);
     }
-
+    /**
+     * 
+     * @Title: findByMultiLine 
+     * @Description: TODO(多线路路由查询) 
+     */
+    @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
+    public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
+    	
+    	return service.findByMultiLine(lineIds);
+    }
 }
@@ -24,6 +24,17 @@ public class GpsController {
 	@Autowired
 	GpsService gpsService;
+	
+	@RequestMapping(value = "/real/all")
+	public Map<String, Object> search(@RequestParam Map<String, Object> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "15") int size,
+			@RequestParam(defaultValue = "timestamp") String order,
+			@RequestParam(defaultValue = "DESC") String direction){
+		
+		
+		return gpsService.search(map, page, size, order, direction);
+	}
 	@RequestMapping(value = "/real/line/{lineCode}")
 	public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
+package com.bsth.controller.realcontrol;
+
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.data.BasicData;
+
+@RestController
+@RequestMapping("/basic")
+public class BasicDataController {
+
+	
+	@RequestMapping("/cars")
+	public Iterable<String> findAllNbbm(Map<String, Object> map){
+		return BasicData.deviceId2NbbmMap.values();
+	}
+	
+	@RequestMapping("/lineCode2Name")
+	public Map<String, String> findLineCodeMap(){
+		return BasicData.lineCode2NameMap;
+	}
+}
@@ -38,6 +38,9 @@ public class DayOfDirectives {
 	// 线路切换指令 64
 	public static Map<String, D64> d64Map;
+	
+	//等待C0_A4回复的用户
+	//public static Map<K, V>
 	@Autowired
 	DirectiveService directiveService;
@@ -63,6 +63,9 @@ public class GpsEntity {
 	/** 当前执行班次ID */
 	private Long schId;
+	
+	/** 是否异常数据 */
+	private boolean abnormal;
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -207,4 +210,12 @@ public class GpsEntity {
 	public void setSchId(Long schId) {
 		this.schId = schId;
 	}
+
+	public boolean isAbnormal() {
+		return abnormal;
+	}
+
+	public void setAbnormal(boolean abnormal) {
+		this.abnormal = abnormal;
+	}
 }
@@ -3,6 +3,7 @@ package com.bsth.data.gpsdata;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -115,6 +116,10 @@ public class GpsRealData implements CommandLineRunner{
 		ScheduleRealInfo sch;
 		for(String device : set){
 			gps = gpsMap.get(device);
+			//过滤异常GPS数据
+			if(gps.isAbnormal())
+				continue;
+			
 			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
 			if(null != sch)
 				gps.setSchId(sch.getId());
@@ -136,6 +141,10 @@ public class GpsRealData implements CommandLineRunner{
 		return gpsMap.get(deviceId);
 	}
+	public Collection<GpsEntity> all(){
+		return gpsMap.values();
+	}
+	
 	@Component
 	public static class GpsDataLoader extends Thread{
@@ -182,9 +191,10 @@ public class GpsRealData implements CommandLineRunner{
 					for(GpsEntity gps : list){
 						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
 						if(StringUtils.isBlank(nbbm))
-							continue;
+							gps.setAbnormal(true);//标记为异常数据
+						else
+							gps.setNbbm(nbbm);
-						gps.setNbbm(nbbm);
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
 						gpsRealData.add(gps);
 					}
@@ -47,7 +47,9 @@ public class ScheduleLateThread extends Thread{
 			if(sch.getDfsjT() > t)
 				break;
-			if(sch.getStatus() == 0 && sch.getFcsjActual() == null){
+			if(sch.isLate() == false 
+					&& sch.getStatus() == 0 
+					&& sch.getFcsjActual() == null){
 				//应发未发
 				sch.setLate(true);
 				//通知客户端
@@ -40,6 +40,8 @@ public class D64 extends Directive{
 		private String deviceId;
 		private String lineId;
+		
+		private String txtContent;
 		public Short getCityCode() {
 			return cityCode;
@@ -64,6 +66,14 @@ public class D64 extends Directive{
 		public void setLineId(String lineId) {
 			this.lineId = lineId;
 		}
+
+		public String getTxtContent() {
+			return txtContent;
+		}
+
+		public void setTxtContent(String txtContent) {
+			this.txtContent = txtContent;
+		}
 	}
 	public Integer getId() {
+package com.bsth.entity.directive;
+
+import javax.persistence.Embeddable;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * 
+ * @ClassName: DC0_A4 
+ * @Description: TODO(参数查询) 
+ * @author PanZhao 
+ * @date 2016年10月18日 下午5:22:36 
+ *
+ */
+public class DC0_A4 extends Directive{
+	
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	
+	@Embeddable
+	public static class DC0A4Data {
+		/**
+		 * 二级协议
+		 */
+		private Short operCode2;
+		/** 设备编号 */
+		private String deviceId;
+		/** 网关IP地址 */
+		private String ipAddress;
+		/** 网关端口 */
+		private int port;
+		/** 定时定距上报模式 */
+		private short reportMode;
+		/** 定时上报时间间隔 */
+		private int interval;
+		/** 定距上报距离间隔 */
+		private String distance; 
+		/** 非线路状态超速阀门 */
+		private short speedingThreshold;
+		/** 预警阀门 */
+		private short alarmThreshold;
+		/** pos机IP地址 */
+		private String posIpAddress;
+	}
+}
@@ -250,4 +250,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
 	List<StationRoute> findByLine(String lineCode, int updown);
+	
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1")
+	List<StationRoute> findByLineCode(String lineCode);
 }
@@ -78,4 +78,6 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	  * @return List<Map<String, Object>>
 	  */
 	 List<Map<String, Object>> findStationRouteInfo(Map<String, Object> map);
+
+	Map<String, Object> findByMultiLine(String lineIds);
 }
@@ -235,13 +235,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
 		// 入库
 		d64.setHttpCode(code);
+		d64.getData().setTxtContent("切换线路[" + lineCode + "]");
 		dayOfDirectives.put64(d64);
 		// 通知设备刷新线路文件，忽略结果
 		if (code == 0)
 			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
 		else
-			d64.setErrorText("[刷新线路文件] 网关通讯失败, code: " + code);
+			d64.setErrorText(" 网关通讯失败, code: " + code);
 		d64Repository.save(d64);
 		return code;
@@ -408,7 +409,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		}
 		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
+		rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
 		rsMap.put("page", page);
 		return rsMap;
 	}
@@ -244,6 +244,9 @@ public class CreateByArrivalData {
 		@Override
 		public int compare(Sample arg0, Sample arg1) {
+			if(arg0.geteTime() == arg1.geteTime())
+				return 0;
+			
 			return (int)(arg0.geteTime() - arg1.geteTime());
 		}
 	}
@@ -10,4 +10,6 @@ public interface GpsService {
 	List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et);
 	Map<String, Object> findBuffAeraByCode(String code, String type);
+
+	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction);
 }
 package com.bsth.service.gps;
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -17,8 +19,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.arrival.ArrivalEntity;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.util.DateUtils;
@@ -37,6 +42,9 @@ public class GpsServiceImpl implements GpsService{
 	ResultSet rs = null;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Autowired
+	GpsRealData gpsRealData;
 	// 历史gps查询
 	@Override
@@ -307,4 +315,89 @@ public class GpsServiceImpl implements GpsService{
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction) {
+		Map<String, Object> rsMap = new HashMap<>();
+		try{
+			//全量
+			Collection<GpsEntity> list = gpsRealData.all();
+			//过滤后的
+			List<GpsEntity> rs = new ArrayList<>();
+			Field[] fields = GpsEntity.class.getDeclaredFields();
+			//排序字段
+			Field orderField = null;
+			//参与过滤的字段
+			List<Field> fs = new ArrayList<>();
+			for(Field f : fields){
+				f.setAccessible(true);
+				if(map.containsKey(f.getName()))
+					fs.add(f);
+				
+				if(f.getName().equals(order))
+					orderField = f;
+			}
+			//过滤数据
+			for(GpsEntity gps : list){
+				if(fieldEquals(fs, gps, map))
+					rs.add(gps);
+			}
+			
+			//排序
+			if(null != orderField)
+				sortGpsList(orderField, rs);
+			
+			//分页
+			int count = rs.size()
+				,s = page * size, e = s + size;
+			if (e > count)
+				e = count;
+			
+			rsMap.put("list", rs.subList(s, e));
+			rsMap.put("totalPages", count % size == 0 ? count / size : count / size + 1);
+			rsMap.put("page", page);
+			rsMap.put("status", ResponseCode.SUCCESS);
+		}catch(Exception e){
+			logger.error("", e);
+			rsMap.put("status", ResponseCode.ERROR);
+		}
+		return rsMap;
+	}
+	
+	private void sortGpsList(final Field f, List<GpsEntity> rs) {
+		Collections.sort(rs, new Comparator<GpsEntity>() {
+
+			@Override
+			public int compare(GpsEntity o1, GpsEntity o2) {
+				try {
+					if(f.get(o1) == f.get(o2))
+						return 0;
+					
+					if(null == f.get(o1))
+						return 1;
+					
+					if(null == f.get(o2))
+						return -1;
+					
+					return f.get(o1).toString().compareTo(f.get(o2).toString());
+				} catch (Exception e) {
+					logger.error("", e);
+					return -1;
+				}
+			}
+		});
+	}
+
+	public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map){
+		try{
+			for(Field f : fs){
+				if(f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+					return false;
+			}
+		}catch(Exception e){
+			logger.error("", e);
+			return false;
+		}
+		return true;
+	}
 }
@@ -11,8 +11,12 @@ import java.util.Map;
 import java.util.Properties;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
@@ -25,6 +29,8 @@ import com.bsth.service.StationRouteService;
 import com.bsth.util.FTPClientUtils;
 import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
 /**
  * 
@@ -971,4 +977,41 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return resultList;
 	}
+
+	@Override
+	public Map<String, Object> findByMultiLine(String lineIds) {
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			List<String> idx = Splitter.on(',').splitToList(lineIds);
+			//路由
+			List<StationRoute> list = new ArrayList<>();
+			/**
+			 * in 查询符 无法和 @EntityGraph 同时配合使用，这可能是一个bug
+			 * 暂时只能循环单线路查询
+			 */
+			//repository.multiLine(idx)
+			for(String id : idx){
+				list.addAll(repository.findByLineCode(id));
+			}
+			
+			//过滤部分字段
+			String jsonStr = JSON.toJSONString(list, new PropertyFilter() {
+				
+				@Override
+				public boolean apply(Object object, String name, Object value) {
+					if(name.equals("line"))
+						return false;
+					return true;
+				}
+			});
+			
+			rs.put("status", ResponseCode.SUCCESS);
+			rs.put("list", jsonStr);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		
+		return rs;
+	}
 }
@@ -11,27 +11,27 @@ function removeConfirm(text, url, success) {
 		skin : 'layui-layer-cfm-delete'
 	}, function(){
 		layer.msg('正在删除...', {icon: 16});
-		
+
 		$post(url, {'_method': 'delete'},function(rs){
-			layer.msg('删除成功！'); 
+			layer.msg('删除成功！');
 			success && success(rs);
 		});
 	});
 }
-function html_encode(str)   {   
-  var s = "";   
-  if (str.length == 0) return ""; 
-  
-  s = str.replace(/&/g, "&gt;");   
-  s = s.replace(/</g, "&lt;");   
-  s = s.replace(/>/g, "&gt;");   
-  s = s.replace(/ /g, "&nbsp;");   
-  s = s.replace(/\'/g, "&#39;");   
-  s = s.replace(/\"/g, "&quot;");   
-  return s;   
-}   
- 
+function html_encode(str)   {
+  var s = "";
+  if (str.length == 0) return "";
+
+  s = str.replace(/&/g, "&gt;");
+  s = s.replace(/</g, "&lt;");
+  s = s.replace(/>/g, "&gt;");
+  s = s.replace(/ /g, "&nbsp;");
+  s = s.replace(/\'/g, "&#39;");
+  s = s.replace(/\"/g, "&quot;");
+  return s;
+}
+
 function successHandle(json, handle){
 	var status = json.status;
@@ -40,14 +40,14 @@ function successHandle(json, handle){
 		location.reload(true);
 		return;
 	}
-	
+
 	if(!status){
 		handle && handle(json);
 		return ;
 	}
-	
+
 	if(status == 'ERROR')
-		layer.alert(json.msg?json.msg:'未知异常', {icon: 2, title: '操作失败'});    
+		layer.alert(json.msg?json.msg:'未知异常', {icon: 2, title: '操作失败'});
 	else
 		handle && handle(json);
 }
@@ -109,12 +109,12 @@ function putFormData(json, fId){
  * @param data
  */
 function initPinYinSelect2(selector, data, cb){
-	
+
 	$.each(data, function(){
 		this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
 		this.camelChars = pinyin.getCamelChars(this.text);
 	});
-	
+
 	$.fn.select2.amd.require(['select2/compat/matcher'], function (oldMatcher) {
 		$(selector).select2({
 			data: data,
@@ -123,14 +123,14 @@ function initPinYinSelect2(selector, data, cb){
 				if(item.fullChars.indexOf(upTerm) != -1
 						|| item.camelChars.indexOf(upTerm) != -1)
 					return true;
-				
+
 				return text.indexOf(term) != -1;
 		    })
 		});
-		
+
 		cb && cb($(selector));
 	});
-	
+
 	return $(selector);
 }
@@ -148,7 +148,7 @@ function createTreeData(arr){
 		if(!pId){
 			treeData.push(arr[i]);
 		}
-			
+
 		for(var j = 0; j < len; j ++){
 			if(pId == arr[j].id){
 				if(!arr[j].children)
@@ -204,4 +204,4 @@ function createVehSearch($e){
 		}
 	})
 	return $e;
-}
 \ No newline at end of file
+}
@@ -54,7 +54,7 @@
 			<span class="label label-sm label-danger">{{item.errorText}}</span>
 		{{else}}
 			{{if item.reply46 != 0}}
-				<span class="label label-sm label-danger">设备无响应</span>
+				<span class="label label-sm label-danger">设备未响应</span>
 			{{else if item.reply47 != 0}}
 				<span class="label label-sm label-warning">驾驶员未确认</span>
 			{{/if}}
@@ -2663,4 +2663,17 @@ tr._home_tr_active abbr.abnormal{
 	bottom: 20px;
 	right: 20px;
 	color: #d0d0d0;
+}
+
+.banner .dropdown-menu {
+    background-color: #ffffff;
+    font-size: 13px;
+}
+.banner  .dropdown-menu {
+    box-shadow: 0 2px 5px 0 rgba(48, 164, 244, 0.24),0 2px 10px 0 rgba(48, 164, 244, 0.24);
+}
+
+.banner  .dropdown-menu > li:hover > a{
+    background-color: #679bbe;
+    color: white !important;
 }
 \ No newline at end of file
@@ -323,14 +323,18 @@ var _data = (function(){
 		}
 		function abnormalCheck(gps){
+			if(!stationRoute[gps.lineId])
+				return;
 			var routes = stationRoute[gps.lineId][gps.upDown]
 				,rs;
-			$.each(routes , function(){
-				if(this.stationCode == gps.stopNo){
-					rs = 1;
-					return false;
-				}
-			});
+			if(routes){
+				$.each(routes , function(){
+					if(this.stationCode == gps.stopNo){
+						rs = 1;
+						return false;
+					}
+				});
+			}
 			if(!rs){
 				gps.abnormal = true;
@@ -22,7 +22,7 @@ var _toolbarEvent = (function(){
 			  type: 1,
 			  area: '980px',
 			  content: content,
-			  title : false,
+			  title : '指令下发记录',
 			  shift: 5,
 			  success: function(){
 			  }
@@ -37,7 +37,7 @@ var _toolbarEvent = (function(){
 			  type: 1,
 			  area: '930px',
 			  content: content,
-			  title : false,
+			  title : '设备上报',
 			  shift: 5,
 			  success: function(){
@@ -53,7 +53,7 @@ var _toolbarEvent = (function(){
 			  type: 1,
 			  area: '530px',
 			  content: content,
-			  title : false,
+			  title : 'TTS',
 			  shift: 5,
 			  success: function(){
 			  }
@@ -61,6 +61,22 @@ var _toolbarEvent = (function(){
 		});
 	});
+	//设备管理
+	$('#deviceConfig').on('click', function(){
+		$.get('/pages/control/line/child_pages/deviceConfig.html', function(content){
+			layer.open({
+			  type: 1,
+			  area: '530px',
+			  content: content,
+			  title : '设备管理',
+			  shift: 5,
+			  success: function(){
+			  }
+			});
+		});
+	});
+	
+	//更新日志
 	$('#updateLogLink').on('click', function(){
 		layer.alert(updateLog.text, {
 			title: updateLog.title,