Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents bd9f9aeb baeb678c
Showing 4 changed files with 60 additions and 6 deletions
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
@@ -5,6 +5,7 @@ import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.impl.ScheduleRealInfoServiceImpl;
 import com.google.common.collect.TreeMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -155,7 +156,8 @@ public class GpsRealData {
                 }
             }else
                 gps.setRemark(null);
-
+            
+            gps.setDvrcode(ScheduleRealInfoServiceImpl.DIRMAP.get(BasicData.deviceId2NbbmMap.get(gps.getDeviceId())));;
             rs.add(gps);
         }
  
@@ -110,6 +110,8 @@ public class GpsEntity implements Cloneable{
  
 	private String remark;
 	private String planCode;
+	
+	private String dvrcode;
  
 	public Object clone() {
 		try {
@@ -119,6 +121,14 @@ public class GpsEntity implements Cloneable{
 		}
 	}
  
+	public String getDvrcode() {
+		return dvrcode;
+	}
+
+	public void setDvrcode(String dvrcode) {
+		this.dvrcode = dvrcode;
+	}
+
 	public String getDeviceId() {
 		return deviceId;
 	}
 package com.bsth.service.realcontrol.impl;
  
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -223,6 +222,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
             sdfSimple = new SimpleDateFormat("yyyyMMdd");
  
+    public  static Map<String,String> DIRMAP ;  // dvr电话 
     private Queue<RepairReport> queue = new ConcurrentLinkedQueue<>();
  
     private ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
@@ -237,6 +237,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 	});
  
+    
+    
     private static Map<String, String> report2repair = new HashMap<String, String>();
  
     static {
@@ -6494,7 +6496,46 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 			}
 		}, 30, 30, TimeUnit.MINUTES);
-	}
+		
+		////  --- 
+		exec.scheduleWithFixedDelay(new Runnable() {
+            @Override
+            public void run() {
+                Map<String, Object> res = new HashMap<>();
+                InputStream in = null;
+                OutputStream out = null;
+                SysUser user = SecurityUtils.getCurrentUser();
+                DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+                String url ="http://211.95.61.66:9008/modules/tSafedrivingCs/DSMBHforCLBH";
+              
+                try {
+                    HttpURLConnection con = (HttpURLConnection)new URL(url.toString()).openConnection();
+                    con.setDoInput(true);
+                    con.setRequestMethod("POST");
+                    con.setConnectTimeout(5000);
+                    con.setReadTimeout(5000);
+                    con.setRequestProperty("keep-alive", "true");
+                    con.setRequestProperty("accept", "*/*");
+                    con.setRequestProperty("content-type", "application/x-www-form-urlencoded");
+                    con.connect();
+
+                    if (con.getResponseCode() == 200) {
+                        in = con.getInputStream();
+                        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+                        IOUtils.copy(in, bout);
+                        DIRMAP = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+                    }
+                } catch (MalformedURLException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            }
+        }, 0, 60 * 60 * 24, TimeUnit.MINUTES);
+    }
 }
  
 class AccountMap implements Comparator<Map<String, Object>> {
@@ -39,6 +39,7 @@
             <a href="javascript:;" style="color: #07D;margin-right: 7px;">预计 {{expectStopTime}} 分钟到达终点</a>
             {{/if}}
             <a href="javascript:;" style="float: left;" onclick="javascript:window.open('http://211.95.61.66:9020/transport_server/dvr_monitor2.html?userid=4&zbh={{nbbm}}');">DVR</a>
+            <a href="javascript:;" style="margin-left: 50px;" onclick="javascript:window.open('sip:{{dvrcode}}@139.196.29.203:5060?method=call');">IP电话</a>
             <a href="javascript:;" style="float: right;" onclick="javascript:gb_map_play_back.initParams('{{deviceId}}', '{{nbbm}}');">轨迹回放</a>
         </div>
     </script>