update...

潘钊
1 parent c68baa08
Showing 5 changed files with 37 additions and 58 deletions
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
@@ -5,7 +5,6 @@ import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
@@ -20,7 +19,7 @@ import java.util.Set;
  * Created by panzhao on 2017/4/6.
  */
 @Component
-public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
+public class SafeDrivCenter implements ApplicationContextAware {
     private static Set<SafeDriv> data;
@@ -65,12 +64,6 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     }
     @Override
-    public void run(String... strings) throws Exception {
-        //定时加载安全驾驶数据
-        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 80, 7, TimeUnit.SECONDS);
-    }
-
-    @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         sendUtils = applicationContext.getBean(SendUtils.class);
     }
@@ -2,6 +2,7 @@ package com.bsth.data.safe_driv;
 import com.alibaba.fastjson.JSON;
 import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -21,24 +22,43 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://180.166.5.82:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
-
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    static String url;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    static {
+        url = "http://180.166.5.82:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
+        get.setConfig(requestConfig);
+    }
+
     @Override
     public void run() {
-        List<SafeDriv> list = null;
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
+        List<SafeDriv> list;
         try {
-            httpClient = HttpClients.createDefault();
-            HttpGet get = new HttpGet(url);
             response = httpClient.execute(get);
-            HttpEntity entity = response.getEntity();
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                get.abort();
+                logger.error("http client status code: " + statusCode);
+                return;
+            }
+
+            entity = response.getEntity();
             if (null != entity) {
-                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                br = new BufferedReader(new InputStreamReader(entity.getContent()));
                 StringBuffer stringBuffer = new StringBuffer();
                 String str = "";
                 while ((str = br.readLine()) != null)
@@ -46,47 +66,14 @@ public class SafeDrivDataLoadThread extends Thread{
                 list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
-                /**
-                 * 模拟数据
-
-                SafeDriv sd1 = new SafeDriv();
-                sd1.setYczltype("1");
-                sd1.setClzbh("W2B-001");
-                sd1.setStartime("2017-04-07 08:00:00.0");
-
-                SafeDriv sd2 = new SafeDriv();
-                sd2.setYczltype("2");
-                sd2.setClzbh("W2B-002");
-                sd2.setStartime("2017-04-07 08:02:00.0");
-
-                SafeDriv sd3 = new SafeDriv();
-                sd3.setYczltype("3");
-                sd3.setClzbh("W2B-003");
-                sd3.setStartime("2017-04-07 08:03:00.0");
-
-                SafeDriv sd4 = new SafeDriv();
-                sd4.setYczltype("4");
-                sd4.setClzbh("W2B-004");
-                sd4.setStartime("2017-04-07 08:04:00.0");
-
-                SafeDriv sd5 = new SafeDriv();
-                sd5.setYczltype("5");
-                sd5.setClzbh("W2B-005");
-                sd5.setStartime("2017-04-07 08:05:00.0");
-                list.add(sd1);
-                list.add(sd2);
-                list.add(sd3);
-                list.add(sd4);
-                list.add(sd5);
-                 */
                 for(SafeDriv sd : list){
                     SafeDrivCenter.put(sd);
                 }
             }
-            httpClient.close();
-            response.close();
+            if (null != response)
+                response.close();
         } catch (Exception e) {
             logger.error("安全驾驶接口报错了" , e.getMessage());
         }
@@ -168,8 +168,7 @@ public class SendUtils{
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessage(mapper.writeValueAsString(map));
-
+			socketHandler.sendMessageToLine(sd.getXlbm(), mapper.writeValueAsString(map));
 		} catch (JsonProcessingException e) {
 			logger.error("", e);
 		}
@@ -305,7 +305,7 @@
 				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
 				{{if obj.destroy==1}}
-				<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>
+				<!--<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>-->
 				{{/if}}
 			</td>
 		</tr>
@@ -20,10 +20,10 @@ var gb_safe_driv = (function () {
     var max = 5;
     var pop = function (sd) {
-        //只有admin用户能收到
+        /*//只有admin用户能收到
         var user = gb_northToolbar.user();
         if (!user || user.userName.indexOf('admin') == -1)
-            return;
+            return;*/
         //时间格式化
         var stm = moment(sd.ts);
@@ -60,7 +60,7 @@ var gb_safe_driv = (function () {
                             '</div>';
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title') + '&nbsp;<button data-nbbm="'+$(this).data('nbbm')+'" class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
+        var title = $(this).data('title');// + '&nbsp;<button data-nbbm="'+$(this).data('nbbm')+'" class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
         var url = $(this).data('url');
         $(this).remove();
         var lightbox = UIkit.lightbox.create([