init2...

潘钊
1 parent d2274741
Showing 22 changed files with 264 additions and 129 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/client/ClientApp.java
src/main/java/com/bsth/client/GpsBeforeBuffer.java
src/main/java/com/bsth/client/common/Protocol2BizUtil.java
src/main/java/com/bsth/client/pd/codec/MessageDecoder.java
src/main/java/com/bsth/client/pd/common/ConvertUtil.java
src/main/java/com/bsth/client/pd/handler/PdClientHandler.java
src/main/java/com/bsth/client/pd/protocol/BasicInfo.java
src/main/java/com/bsth/client/pd/protocol/PdFactory.java
src/main/java/com/bsth/client/pd/protocol/PdMessage.java
src/main/java/com/bsth/client/pd/protocol/Pd_31_0.java
src/main/java/com/bsth/client/pd/protocol/Pd_41_0.java
src/main/java/com/bsth/client/pd/protocol/Pd_42_0.java
src/main/java/com/bsth/client/pf/codec/MessageDecoder.java
src/main/java/com/bsth/client/pf/common/ConvertUtil.java
src/main/java/com/bsth/client/pf/handler/PfClientHandler.java
src/main/java/com/bsth/client/pf/protocol/PfFactory.java
src/main/java/com/bsth/client/pf/protocol/PfMessage.java
src/main/java/com/bsth/client/pf/protocol/Pf_1_0.java
@@ -2,24 +2,14 @@ package com.bsth;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(7);
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(Application.class);
-	}
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(Application.class, args);
 	}
-
 }
 \ No newline at end of file
@@ -4,7 +4,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.CharacterEncodingFilter;
-import org.springframework.web.filter.HttpPutFormContentFilter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import javax.servlet.Filter;
@@ -12,16 +11,7 @@ import javax.servlet.Filter;
 @Configuration
 @ComponentScan
 public class WebAppConfiguration extends WebMvcConfigurerAdapter {
-	
-	/**
-	 * @Title: httpPutFormContentFilter 
-	 * @Description: TODO(弥补浏览器不支持PUT/DELETE，对携带 _method 参数的请求进行转换) 
-	 */
-	@Bean
-	public Filter httpPutFormContentFilter() {
-		return new HttpPutFormContentFilter();
-	}
-	
+
 	/**
 	 * @Title: characterEncodingFilter 
 	 * @Description: TODO(编码过滤器) 
 package com.bsth.client;
-import com.bsth.data.gpsdata.client.pd.codec.PdMessageCodecFactory;
-import com.bsth.data.gpsdata.client.pd.handler.PdClientHandler;
-import com.bsth.data.gpsdata.client.pd.protocol.Pd_31_0;
-import com.bsth.data.gpsdata.client.pf.codec.PfMessageCodecFactory;
-import com.bsth.data.gpsdata.client.pf.handler.PfClientHandler;
+import com.bsth.client.pd.codec.PdMessageCodecFactory;
+import com.bsth.client.pd.handler.PdClientHandler;
+import com.bsth.client.pd.protocol.Pd_31_0;
+import com.bsth.client.pf.codec.PfMessageCodecFactory;
+import com.bsth.client.pf.handler.PfClientHandler;
 import com.bsth.util.ConfigUtil;
 import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.future.WriteFuture;
@@ -51,7 +51,7 @@ public class ClientApp {
             con.awaitUninterruptibly();
             IoSession session = con.getSession();
             session.setAttribute("deviceId", device);
-            com.bsth.data.gpsdata.client.pd.protocol.PdMessage msg = new com.bsth.data.gpsdata.client.pd.protocol.PdMessage();
+            com.bsth.client.pd.protocol.PdMessage msg = new com.bsth.client.pd.protocol.PdMessage();
             Pd_31_0 body = new Pd_31_0();
             body.setFunCode((short)0x15);
             body.setLineId(0);
 package com.bsth.client;
-import com.bsth.Application;
-import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
+import com.bsth.client.pd.protocol.BasicInfo;
+import com.bsth.entity.GpsEntity;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
 /**
  * 从 socket client 到 .. 的缓冲
@@ -25,9 +16,6 @@ public class GpsBeforeBuffer {
     static LinkedList<GpsEntity> linkedList = new LinkedList<>();
-    @Autowired
-    GpsHandleThread gpsHandleThread;
-
     public void put(BasicInfo basicInfo){
         //放弃补发数据
         byte cacheData = getCacheState(basicInfo.getServiceState());
@@ -51,12 +39,6 @@ public class GpsBeforeBuffer {
         if (StringUtils.isBlank(gps.getDeviceId()))
             return;
-        String nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-        if (StringUtils.isBlank(nbbm))
-            gps.setIncomplete(true);
-        else
-            gps.setNbbm(nbbm);
-
         linkedList.addLast(gps);
     }
@@ -64,49 +46,6 @@ public class GpsBeforeBuffer {
         return (byte)(((serviceState & 0x00100000) == 0x00100000) ? 1 : 0);
     }
-    public void init(){
-        Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20 * 1000, 500, TimeUnit.MILLISECONDS);
-    }
-
-    static int idleCount = 0;
-    @Component
-    public static class GpsHandleThread extends Thread{
-
-        List<GpsEntity> list;
-
-        @Autowired
-        GpsRealAnalyse gpsRealAnalyse;
-
-        @Autowired
-        ClientApp clientApp;
-
-        Logger log = LoggerFactory.getLogger(this.getClass());
-
-        @Override
-        public void run() {
-            list = new ArrayList<>(200);
-
-            GpsEntity gps;
-            for(int i = 0; i < 4000; i ++){
-                gps = linkedList.poll();
-                if(gps == null)
-                    break;
-                list.add(gps);
-            }
-
-            if(list.size() == 0){
-                idleCount ++;
-                //连续40次没有数据，重建socket连接
-                if(idleCount == 40){
-                    log.info("idleCount == 40");
-                    idleCount = 0;
-                    clientApp.destroy();
-                    clientApp.init();
-                }
-            }
-            gpsRealAnalyse.analyse(list);
-        }
-    }
     /**
      * 获取运营状态
@@ -4,9 +4,9 @@ package com.bsth.client.common;
 //import com.bsth.data.gpsdata.socket_client_001.pf.protocol.PfMessage;
 //import com.bsth.data.gpsdata.socket_client_001.pf.protocol.Pf_1_0;
-import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
-import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
-import com.bsth.data.gpsdata.client.pf.protocol.Pf_1_0;
+import com.bsth.client.pd.protocol.BasicInfo;
+import com.bsth.client.pf.protocol.PfMessage;
+import com.bsth.client.pf.protocol.Pf_1_0;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 package com.bsth.client.pd.codec;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
+import com.bsth.client.pd.common.ConvertUtil;
+import com.bsth.client.pd.protocol.PdMessage;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
 package com.bsth.client.pd.common;
-import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
+import com.bsth.client.common.ThreadLocalDateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 package com.bsth.client.pd.handler;
-import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
-import com.bsth.data.gpsdata.client.pd.protocol.Pd_41_0;
-import com.bsth.data.gpsdata.client.pd.protocol.Pd_42_0;
+import com.bsth.client.GpsBeforeBuffer;
+import com.bsth.client.msg.IMessageBody;
+import com.bsth.client.pd.protocol.PdMessage;
+import com.bsth.client.pd.protocol.Pd_41_0;
+import com.bsth.client.pd.protocol.Pd_42_0;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;
 package com.bsth.client.pd.protocol;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+import com.bsth.client.pd.common.ConvertUtil;
 import java.nio.ByteBuffer;
 import java.util.Date;
 package com.bsth.client.pd.protocol;
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.client.msg.IMessageBody;
 public class PdFactory {
 package com.bsth.client.pd.protocol;
-
-import com.bsth.data.gpsdata.client.msg.IMessage;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.client.msg.IMessage;
+import com.bsth.client.msg.IMessageBody;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 package com.bsth.client.pd.protocol;
-
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+import com.bsth.client.msg.IMessageBody;
+import com.bsth.client.pd.common.ConvertUtil;
 import java.nio.ByteBuffer;
 import java.util.Date;
 package com.bsth.client.pd.protocol;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+import com.bsth.client.msg.IMessageBody;
+import com.bsth.client.pd.common.ConvertUtil;
 import java.nio.ByteBuffer;
 package com.bsth.client.pd.protocol;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+import com.bsth.client.msg.IMessageBody;
+import com.bsth.client.pd.common.ConvertUtil;
 import java.nio.ByteBuffer;
 package com.bsth.client.pf.codec;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
-import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
+import com.bsth.client.pd.common.ConvertUtil;
+import com.bsth.client.pf.protocol.PfMessage;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
 package com.bsth.client.pf.common;
-import com.bsth.data.gpsdata.client.common.ThreadLocalDateUtil;
+import com.bsth.client.common.ThreadLocalDateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 package com.bsth.client.pf.handler;
-import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
-import com.bsth.data.gpsdata.client.common.Protocol2BizUtil;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
-import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
+import com.bsth.client.GpsBeforeBuffer;
+import com.bsth.client.common.Protocol2BizUtil;
+import com.bsth.client.msg.IMessageBody;
+import com.bsth.client.pd.protocol.BasicInfo;
+import com.bsth.client.pf.protocol.PfMessage;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;
 package com.bsth.client.pf.protocol;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.client.msg.IMessageBody;
 public class PfFactory {
 package com.bsth.client.pf.protocol;
-import com.bsth.data.gpsdata.client.msg.IMessage;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
+import com.bsth.client.msg.IMessage;
+import com.bsth.client.msg.IMessageBody;
 import java.util.Arrays;
 package com.bsth.client.pf.protocol;
-import com.bsth.data.gpsdata.client.msg.IMessageBody;
-import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
+import com.bsth.client.msg.IMessageBody;
+import com.bsth.client.pd.common.ConvertUtil;
 import java.nio.ByteBuffer;
 import java.util.Date;
+package com.bsth.entity;
+
+/**
+ * @author PanZhao
+ * @ClassName: GpsRealData
+ * @Description: TODO(HTTP接口的实时GPS数据)
+ * @date 2016年5月11日 下午4:32:07
+ */
+public class GpsEntity {
+
+    /**
+     * 公司代码
+     */
+    private Short companyCode;
+
+    /**
+     * 线路编码
+     */
+    private String lineId;
+
+    /**
+     * 设备编码
+     */
+    private String deviceId;
+
+    /**
+     * 停车场编码
+     */
+    private String carparkNo;
+
+    /**
+     * 站点编码
+     */
+    private String stopNo;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 到站时间
+     */
+    private long arrTime;
+
+    /**
+     * 经度
+     */
+    private Float lon;
+
+    /**
+     * 纬度
+     */
+    private Float lat;
+
+    /**
+     * 发送时间戳
+     */
+    private Long timestamp;
+
+    /**
+     * 速度
+     */
+    private Float speed;
+
+    /**
+     * 方向（角度）
+     */
+    private float direction;
+
+    /**
+     * 营运状态（ 0 营运 ，1 非营运， -1 无效）
+     */
+    private Integer state;
+
+    /**
+     * 上下行（0 上行 ， 1 下行 ， -1 无效）
+     */
+    private Byte upDown;
+
+    private int version;
+
+    /**
+     * gps是否有效 设备端发送的状态
+     */
+    private int valid;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getCarparkNo() {
+        return carparkNo;
+    }
+
+    public void setCarparkNo(String carparkNo) {
+        this.carparkNo = carparkNo;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public Float getLon() {
+        return lon;
+    }
+
+    public void setLon(Float lon) {
+        this.lon = lon;
+    }
+
+    public Float getLat() {
+        return lat;
+    }
+
+    public void setLat(Float lat) {
+        this.lat = lat;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public long getArrTime() {
+        return arrTime;
+    }
+
+    public void setArrTime(long arrTime) {
+        this.arrTime = arrTime;
+    }
+
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public int getValid() {
+        return valid;
+    }
+
+    public void setValid(int valid) {
+        this.valid = valid;
+    }
+
+
+    public short getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(short companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public Byte getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(Byte upDown) {
+        this.upDown = upDown;
+    }
+
+
+    public float getDirection() {
+        return direction;
+    }
+
+    public void setDirection(float direction) {
+        this.direction = direction;
+    }
+
+    public Float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Float speed) {
+        this.speed = speed;
+    }
+}
@@ -6,8 +6,6 @@ public class ConfigUtil {
 	static{
 		tools = new Tools("application.properties");
-		String active = tools.getValue("spring.profiles.active");
-		tools = new Tools("application-"+active+".properties");
 	}
 	public static String get(String key){