1.

王通
1 parent acdf9f10
Showing 5 changed files with 85 additions and 72 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/RfidHttpLoader.java
@@ -194,7 +194,7 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
-        sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
-package com.bsth.data.directive;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.ConfigUtil;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author PanZhao
- * @ClassName: GatewayHttpUtils
- * @Description: TODO(和网关HTTP通讯工具类)
- * @date 2016年8月14日 下午9:50:46
- */
-public class GatewayHttpUtils {
-    static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
-
-    static String url;
-    static CloseableHttpClient httpClient = null;
-    static HttpPost post;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-
-    static {
-        url = ConfigUtil.get("http.send.directive");
-        httpClient = HttpClients.createDefault();
-        post = new HttpPost(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(3000).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(3000).build();
-        post.setConfig(requestConfig);
-    }
-
-    public static int postJson(String jsonStr) {
-        logger.info("send : " + jsonStr);
-
-        int code = -1;
-        try {
-            post.setEntity(new StringEntity(jsonStr, "utf-8"));
-
-            response = httpClient.execute(post);
-
-            int statusCode = response.getStatusLine().getStatusCode();
-            if(statusCode != 200){
-                logger.error("http client status code: " + statusCode);
-            }
-
-            JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
-            if (null != json && json.getInteger("errCode") == 0)
-                code = 0;
-            else
-                logger.error("和网关http通讯失败，rs: " + json);
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        return code;
-    }
-}
+package com.bsth.data.directive;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author PanZhao
+ * @ClassName: GatewayHttpUtils
+ * @Description: TODO(和网关HTTP通讯工具类)
+ * @date 2016年8月14日 下午9:50:46
+ */
+@Component
+public class GatewayHttpUtils implements InitializingBean {
+    static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
+
+    static String url;
+    static CloseableHttpClient httpClient = null;
+    static HttpPost post;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+
+    public static int postJson(String jsonStr) {
+        logger.info("send : " + jsonStr);
+
+        int code = -1;
+        try {
+            post.setEntity(new StringEntity(jsonStr, "utf-8"));
+
+            response = httpClient.execute(post);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                logger.error("http client status code: " + statusCode);
+            }
+
+            JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
+            if (null != json && json.getInteger("errCode") == 0)
+                code = 0;
+            else
+                logger.error("和网关http通讯失败，rs: " + json);
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return code;
+    }
+
+    @Value("${http.send.directive}")
+    public void setUrl(String url) {
+        GatewayHttpUtils.url = url;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        httpClient = HttpClients.createDefault();
+        post = new HttpPost(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(3000).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(3000).build();
+        post.setConfig(requestConfig);
+    }
+}
@@ -5,7 +5,6 @@ import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
-import com.bsth.util.ConfigUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
-import com.bsth.util.ConfigUtil;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 package com.bsth.data.gpsdata_v2.rfid;
 import com.bsth.data.gpsdata_v2.rfid.entity.RfidInfo;
-import com.bsth.util.ConfigUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -20,11 +21,12 @@ import java.util.List;
  * @author hill
  * @date
  */
+@Component
 public class RfidHttpLoader {
     private final static Logger log = LoggerFactory.getLogger(RfidHttpLoader.class);
-    private static String RFID_URL = ConfigUtil.get("http.rfid.url");
+    private static String RFID_URL;
     public static List<RfidInfo> load() {
         List<RfidInfo> result = new ArrayList<>();
@@ -75,4 +77,9 @@ public class RfidHttpLoader {
         return result;
     }
+
+    @Value("${http.rfid.url}")
+    public void setRfidUrl(String rfidUrl) {
+        RFID_URL = rfidUrl;
+    }
 }