update

潘钊
1 parent b44408ba
Showing 3 changed files with 39 additions and 26 deletions
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
@@ -68,7 +68,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 4, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -90,7 +90,7 @@ public class GpsRealData implements CommandLineRunner{
 		}
 		gpsMap.put(device, gps);
-		if(StringUtils.isNotEmpty(gps.getLineId()))
+		if(StringUtils.isNotBlank(gps.getLineId()))
 			lineCode2Devices.put(gps.getLineId(), device);
 		return gps;
 	}
@@ -194,6 +194,10 @@ public class GpsRealData implements CommandLineRunner{
 					String nbbm;
 					for(GpsEntity gps : list){
+						//没有设备号
+						if(StringUtils.isBlank(gps.getDeviceId()))
+							continue;
+
 						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
 						if(StringUtils.isBlank(nbbm))
 							gps.setAbnormal(true);//标记为异常数据
@@ -249,7 +253,8 @@ public class GpsRealData implements CommandLineRunner{
 					return true;
 				}
 			}
-			else if(BasicData.lineSEPointMap.containsKey(key+"E")){
+
+			if(BasicData.lineSEPointMap.containsKey(key+"E")){
 				stationCode = BasicData.lineSEPointMap.get(key+"E");
 				if(gps.getStopNo().equals(stationCode)){
 					gps.setsEPoint(true);
@@ -264,22 +269,22 @@ public class GpsRealData implements CommandLineRunner{
 		 * @param gps
 		 */
 		public void correctUpdown(GpsEntity gps){
-			Integer updown;
-			//如果走向未知，尝试根据站点纠正走向
+			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+			if(updown != null && !updown.equals(gps.getUpDown()))
+				gps.setUpDown(updown);
+			/*//如果走向未知，尝试根据站点纠正走向
 			if(gps.getUpDown() == -1){
-				updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-				if(updown != null)
-					gps.setUpDown(updown);
-			}
+
+			}*/
 			if(isSEPoint(gps))
 				return;
-			//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
+			/*//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
 			updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
 			if(updown != null && !gps.getUpDown().equals(updown)){
 				gps.setUpDown(updown);
-			}
+			}*/
 		}
 	}
 }
@@ -140,8 +140,9 @@ svg.line-chart path.station_link.down {
 svg.line-chart text.station_text {
     writing-mode: tb;
-    fill: #676767;
-    text-shadow: 1px 1px 1px #e0e0e0;
+    fill: #3e3e3e;
+    letter-spacing: -.2px;
+    text-shadow: 0 0 2px #dadada;
 }
 svg.line-chart text.station_text.up {
@@ -165,17 +166,19 @@ svg.line-chart g.item:nth-last-child(3)&gt;text {
 svg.line-chart g.gps-wrap>rect {
     width: 28px;
     height: 24px;
-    fill: #fff;
-    rx: 5px;
+    /*fill: #fff;*/
+    rx: 4px;
     cursor: pointer;
 }
 svg.line-chart g.gps-wrap>rect[updown="0"] {
-    stroke: #5e96d2;
+    stroke: rgb(62, 80, 179);
+    fill: rgb(62, 80, 179);
 }
 svg.line-chart g.gps-wrap>rect[updown="1"] {
-    stroke: #c92121;
+    stroke: #c94f21;
+    fill: #c94f21;
 }
 svg.line-chart g.gps-wrap>rect.hover {
@@ -189,11 +192,11 @@ svg.line-chart g.gps-wrap&gt;text {
 }
 svg.line-chart g.gps-wrap>text[updown="0"] {
-    fill: #5e96d2;
+    fill: #fff;
 }
 svg.line-chart g.gps-wrap>text[updown="1"] {
-    fill: #c92121;
+    fill: #fff;
 }
 svg.line-chart .merge_hide {
@@ -204,8 +207,11 @@ svg.line-chart g.merge-item rect {
     width: 24px;
     height: 24px;
     rx: 15px;
-    fill: rgb(62, 80, 179);
+    fill: #19a53a;
     cursor: pointer;
+    stroke: #19a53a;
+    stroke-dasharray: 1,2;
+    stroke-width: 3px;
 }
 svg.line-chart g.merge-item text {
@@ -97,7 +97,8 @@ var gb_svg_chart = (function() {
         var c_clzz = {
             'station_circle': true
         };
-        items.append('circle').classed(c_clzz)
+        items.select(function (d) {return d.type!=1?this:null;})
+            .append('circle').classed(c_clzz)
             .attr('cx', cx)
             .attr('cy', cy)
             .attr('data-id', function(d) {
@@ -106,13 +107,14 @@ var gb_svg_chart = (function() {
         //down circle
         c_clzz.down = true;
-        items.append('circle').classed(c_clzz)
+        items.select(function (d) {return d.type!=0?this:null;})
+            .append('circle').classed(c_clzz)
             .attr('cx', cx)
             .attr('cy', function(d, i) {
                 return cy(d, i) + chart_height;
             })
             .attr('data-id', function(d) {
-                return d.id[1];
+                return d.type==1?d.id[0]:d.id[1];
             });
         //station name text
@@ -227,7 +229,7 @@ var gb_svg_chart = (function() {
             if(!this.stopNo || this.stopNo=='')
                 return true;
             if(this.sEPoint)
-                this.stopNo=this.stopNo+'_'+this.state;
+                this.stopNo=this.stopNo+'_'+this.upDown;
             list.push(this);
         });
@@ -295,12 +297,12 @@ var gb_svg_chart = (function() {
         //merge rect
         mergerG.append('rect').attr('x', x - 12)
             .attr('y', function() {
-                return isDown ? y + 5 : y - 30;
+                return isDown ? y + 7 : y - 32;
             });
         //merge text
         mergerG.append('text').text(gpsArr.length)
             .attr('x', x - 4)
-            .attr('y', isDown ? y + 22 : y - 12);
+            .attr('y', isDown ? y + 24 : y - 14);
     }
     return {