update...

潘钊
1 parent 75ddc678
Showing 26 changed files with 1405 additions and 52 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/server_rs/AuthorizeInterceptor_IN.java
src/main/java/com/bsth/server_rs/adapter/DateAdapter_yMd.java
src/main/java/com/bsth/server_rs/adapter/DateAdapter.java → src/main/java/com/bsth/server_rs/adapter/DateAdapter_yMdHms.java
src/main/java/com/bsth/server_rs/base_info/car/Car.java
src/main/java/com/bsth/server_rs/base_info/car/CarRestService.java
src/main/java/com/bsth/server_rs/base_info/car/CarService.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarBufferData.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/line/Line.java
src/main/java/com/bsth/server_rs/base_info/line/LineServiceImpl.java → src/main/java/com/bsth/server_rs/base_info/line/LineRestService.java
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineBufferData.java
src/main/java/com/bsth/server_rs/base_info/person/PersonRestService.java
src/main/java/com/bsth/server_rs/base_info/person/PersonService.java
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonBufferData.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonRefreshThread.java
src/main/java/com/bsth/server_rs/exception/AesException.java
src/main/java/com/bsth/server_rs/exception/AesExceptionMapper.java
src/main/java/com/bsth/server_rs/gps/GpsEntity.java
 package com.bsth;
 import com.bsth.server_rs.AuthorizeInterceptor_IN;
+import com.bsth.server_rs.base_info.car.CarRestService;
+import com.bsth.server_rs.base_info.line.LineRestService;
+import com.bsth.server_rs.base_info.person.PersonRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
-import com.bsth.server_rs.base_info.line.LineServiceImpl;
+import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_ws.attendance.AttendanceServiceSoap;
 import com.bsth.server_ws.park_station.CompanyServiceSoap;
 import com.bsth.server_ws.waybill.LD_ServiceSoap;
@@ -40,7 +43,7 @@ public class CXFConfig {
         return endpoint;
     }
-   @Bean
+    @Bean
     public Endpoint ldServiceEndpoint() {
         EndpointImpl endpoint = new EndpointImpl(springBus(), new LD_ServiceSoap());
         endpoint.publish("/LD_Service");
@@ -70,7 +73,7 @@ public class CXFConfig {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
         endpoint.setBus(springBus());
         endpoint.setAddress("/rest");
-        endpoint.setServiceBeans(Arrays.<Object>asList(new LineServiceImpl()));
+        endpoint.setServiceBeans(Arrays.<Object>asList(new LineRestService(), new CarRestService(), new PersonRestService(), new GpsRestService()));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -33,6 +33,7 @@ public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor&lt;Message&gt; i
     private static final String TIMESTAMP = "timestamp";
     private static final String NONCE = "nonce";
     private static final String PASSWORD = "password";
+    private static final int MAX_TIME_DIFF = 1000 * 60 * 10;
     static UserService userService;
@@ -45,6 +46,7 @@ public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor&lt;Message&gt; i
     @Override
     public void handleMessage(Message message) throws Fault {
+        long t = System.currentTimeMillis();
         if (message.get(Message.QUERY_STRING) == null) {
             throw new AesException(AesException.MISS_SIGN);
         }
@@ -67,6 +69,16 @@ public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor&lt;Message&gt; i
         if (!map.containsKey(TIMESTAMP)) {
             throw new AesException(AesException.MISS_TIMESTAMP);
         }
+
+        try{
+            long timestamp = Long.parseLong(map.get(TIMESTAMP));
+            if(Math.abs(t - timestamp) > MAX_TIME_DIFF){
+                throw new AesException(AesException.INVALID_TIMESTAMP);
+            }
+        }catch(Exception e){
+            throw new AesException(AesException.INVALID_TIMESTAMP);
+        }
+
         if (!map.containsKey(NONCE)) {
             throw new AesException(AesException.MISS_NONCE);
         }
+package com.bsth.server_rs.adapter;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import java.util.Date;
+
+/**
+ * 时间格式处理 yyyy-MM-dd
+ * Created by panzhao on 2017/3/28.
+ */
+public class DateAdapter_yMd extends XmlAdapter<String, Date> {
+
+    private static DateTimeFormatter fmtyyyyMMddHHmmss = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    @Override
+    public Date unmarshal(String v) throws Exception {
+        return fmtyyyyMMddHHmmss.parseDateTime(v).toDate();
+    }
+
+    @Override
+    public String marshal(Date v) throws Exception {
+        return fmtyyyyMMddHHmmss.print(v.getTime());
+    }
+}
@@ -10,7 +10,7 @@ import java.util.Date;
  * 时间格式处理 yyyy-MM-dd HH:mm:ss
  * Created by panzhao on 2017/3/28.
  */
-public class DateAdapter extends XmlAdapter<String, Date> {
+public class DateAdapter_yMdHms extends XmlAdapter<String, Date> {
     private static DateTimeFormatter fmtyyyyMMddHHmmss = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+package com.bsth.server_rs.base_info.car;
+
+import com.bsth.server_rs.adapter.DateAdapter_yMd;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 车辆信息
+ * Created by panzhao on 2017/3/30.
+ */
+@XmlRootElement
+public class Car implements Serializable {
+
+    /**
+     * 主键Id
+     */
+    private Integer id;
+
+    /**
+     * 自编号/内部编号
+     */
+    private String insideCode;
+
+    /**
+     * 公司代码
+     */
+    private String businessCode;
+    /**
+     * 分公司编码
+     */
+    private String brancheCompanyCode;
+
+    /**
+     * 车牌号
+     */
+    private String carPlate;
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
+    /**
+     * 设备终端号
+     */
+    private String equipmentCode;
+
+    // 以下信息来自总公司的业务系统，可能需要调用相关接口
+    /**
+     * 车型类别
+     */
+    private String carClass;
+    /**
+     * 技术速度
+     */
+    private Double speed;
+    /**
+     * 座位数
+     */
+    private Integer carSeatnNumber;
+    /**
+     * 载客标准
+     */
+    private String carStandard;
+    /**
+     * 标准油耗(开空调)
+     */
+    private Double kburnStandard;
+    /**
+     * 标准油耗(关空调)
+     */
+    private Double gburnStandard;
+    /**
+     * 报废号
+     */
+    private String scrapCode;
+    /**
+     * 报废日期
+     */
+    private Date scrapDate;
+    /**
+     * 厂牌型号1
+     */
+    private String makeCodeOne;
+    /**
+     * 厂牌型号2
+     */
+    private String makeCodeTwo;
+    /**
+     * 车辆等级标准
+     */
+    private String carGride;
+    /**
+     * 出厂排放标准
+     */
+    private String emissionsStandard;
+    /**
+     * 发动机号码1
+     */
+    private String engineCodeOne;
+    /**
+     * 发动机号码2
+     */
+    private String engineCodeTwo;
+    /**
+     * 车架号码1
+     */
+    private String carNumberOne;
+    /**
+     * 车架号码2
+     */
+    private String carNumberTwo;
+    /**
+     * 启用日期
+     */
+    private Date openDate;
+    /**
+     * 取消日期
+     */
+    private Date closeDate;
+
+    /**
+     * 是否空调车
+     */
+    private Boolean hvacCar;
+    /**
+     * 有无人售票
+     */
+    private Boolean ticketType;
+    /**
+     * 是否有LED服务屏
+     */
+    private Boolean ledScreen;
+    /**
+     * 是否有TV视频
+     */
+    private Boolean tvVideoType;
+
+    /**
+     * 车辆类型
+     */
+    private String carType;
+    /**
+     * 是否机动车（机动车类型选择）
+     */
+    private String vehicleStats;
+    /**
+     * 营运状态
+     */
+    private String operatorsState;
+    /**
+     * 营运证编码
+     */
+    private String serviceNo;
+    /**
+     * 是否电车（TODO：在原系统里没有，这里暂时留着）
+     */
+    private Boolean sfdc;
+    /**
+     * 备注/描述
+     */
+    private String descriptions;
+
+    /**
+     * 视频编号
+     */
+    private String videoCode;
+    /**
+     * 是否报废
+     */
+    private Boolean scrapState;
+
+    /**
+     * RFID 车卡号
+     */
+    private String icRFID;
+
+    /**
+     * RFID 标签号
+     */
+    private String tagRFID;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getInsideCode() {
+        return insideCode;
+    }
+
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
+
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getCarClass() {
+        return carClass;
+    }
+
+    public void setCarClass(String carClass) {
+        this.carClass = carClass;
+    }
+
+    public Double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    public Integer getCarSeatnNumber() {
+        return carSeatnNumber;
+    }
+
+    public void setCarSeatnNumber(Integer carSeatnNumber) {
+        this.carSeatnNumber = carSeatnNumber;
+    }
+
+    public String getCarStandard() {
+        return carStandard;
+    }
+
+    public void setCarStandard(String carStandard) {
+        this.carStandard = carStandard;
+    }
+
+    public Double getKburnStandard() {
+        return kburnStandard;
+    }
+
+    public void setKburnStandard(Double kburnStandard) {
+        this.kburnStandard = kburnStandard;
+    }
+
+    public Double getGburnStandard() {
+        return gburnStandard;
+    }
+
+    public void setGburnStandard(Double gburnStandard) {
+        this.gburnStandard = gburnStandard;
+    }
+
+    public String getScrapCode() {
+        return scrapCode;
+    }
+
+    public void setScrapCode(String scrapCode) {
+        this.scrapCode = scrapCode;
+    }
+
+    @XmlJavaTypeAdapter(DateAdapter_yMd.class)
+    public Date getScrapDate() {
+        return scrapDate;
+    }
+
+    public void setScrapDate(Date scrapDate) {
+        this.scrapDate = scrapDate;
+    }
+
+    public String getMakeCodeOne() {
+        return makeCodeOne;
+    }
+
+    public void setMakeCodeOne(String makeCodeOne) {
+        this.makeCodeOne = makeCodeOne;
+    }
+
+    public String getMakeCodeTwo() {
+        return makeCodeTwo;
+    }
+
+    public void setMakeCodeTwo(String makeCodeTwo) {
+        this.makeCodeTwo = makeCodeTwo;
+    }
+
+    public String getCarGride() {
+        return carGride;
+    }
+
+    public void setCarGride(String carGride) {
+        this.carGride = carGride;
+    }
+
+    public String getEmissionsStandard() {
+        return emissionsStandard;
+    }
+
+    public void setEmissionsStandard(String emissionsStandard) {
+        this.emissionsStandard = emissionsStandard;
+    }
+
+    public String getEngineCodeOne() {
+        return engineCodeOne;
+    }
+
+    public void setEngineCodeOne(String engineCodeOne) {
+        this.engineCodeOne = engineCodeOne;
+    }
+
+    public String getEngineCodeTwo() {
+        return engineCodeTwo;
+    }
+
+    public void setEngineCodeTwo(String engineCodeTwo) {
+        this.engineCodeTwo = engineCodeTwo;
+    }
+
+    public String getCarNumberOne() {
+        return carNumberOne;
+    }
+
+    public void setCarNumberOne(String carNumberOne) {
+        this.carNumberOne = carNumberOne;
+    }
+
+    public String getCarNumberTwo() {
+        return carNumberTwo;
+    }
+
+    public void setCarNumberTwo(String carNumberTwo) {
+        this.carNumberTwo = carNumberTwo;
+    }
+
+    @XmlJavaTypeAdapter(DateAdapter_yMd.class)
+    public Date getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(Date openDate) {
+        this.openDate = openDate;
+    }
+
+    @XmlJavaTypeAdapter(DateAdapter_yMd.class)
+    public Date getCloseDate() {
+        return closeDate;
+    }
+
+    public void setCloseDate(Date closeDate) {
+        this.closeDate = closeDate;
+    }
+
+    public Boolean getHvacCar() {
+        return hvacCar;
+    }
+
+    public void setHvacCar(Boolean hvacCar) {
+        this.hvacCar = hvacCar;
+    }
+
+    public Boolean getTicketType() {
+        return ticketType;
+    }
+
+    public void setTicketType(Boolean ticketType) {
+        this.ticketType = ticketType;
+    }
+
+    public Boolean getLedScreen() {
+        return ledScreen;
+    }
+
+    public void setLedScreen(Boolean ledScreen) {
+        this.ledScreen = ledScreen;
+    }
+
+    public Boolean getTvVideoType() {
+        return tvVideoType;
+    }
+
+    public void setTvVideoType(Boolean tvVideoType) {
+        this.tvVideoType = tvVideoType;
+    }
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public String getVehicleStats() {
+        return vehicleStats;
+    }
+
+    public void setVehicleStats(String vehicleStats) {
+        this.vehicleStats = vehicleStats;
+    }
+
+    public String getOperatorsState() {
+        return operatorsState;
+    }
+
+    public void setOperatorsState(String operatorsState) {
+        this.operatorsState = operatorsState;
+    }
+
+    public String getServiceNo() {
+        return serviceNo;
+    }
+
+    public void setServiceNo(String serviceNo) {
+        this.serviceNo = serviceNo;
+    }
+
+    public Boolean getSfdc() {
+        return sfdc;
+    }
+
+    public void setSfdc(Boolean sfdc) {
+        this.sfdc = sfdc;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public String getVideoCode() {
+        return videoCode;
+    }
+
+    public void setVideoCode(String videoCode) {
+        this.videoCode = videoCode;
+    }
+
+    public Boolean getScrapState() {
+        return scrapState;
+    }
+
+    public void setScrapState(Boolean scrapState) {
+        this.scrapState = scrapState;
+    }
+
+    public String getIcRFID() {
+        return icRFID;
+    }
+
+    public void setIcRFID(String icRFID) {
+        this.icRFID = icRFID;
+    }
+
+    public String getTagRFID() {
+        return tagRFID;
+    }
+
+    public void setTagRFID(String tagRFID) {
+        this.tagRFID = tagRFID;
+    }
+}
+package com.bsth.server_rs.base_info.car;
+
+import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Path("/car")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class CarRestService {
+
+    @GET
+    @Path("/all")
+    public List<Car> findAll(){
+        return CarBufferData.findAll();
+    }
+
+    @GET
+    @Path("/company/{companyId}")
+    public List<Car> findByCompany(@PathParam("companyId") String companyId) {
+        return companyId.equals("-9999") ? CarBufferData.findAll() : CarBufferData.findByCompany(companyId);
+    }
+
+    @GET
+    @Path("/{nbbm}")
+    public Car findOne(@PathParam("nbbm") String nbbm) {
+        return CarBufferData.findOne(nbbm);
+    }
+}
-package com.bsth.server_rs.base_info.car;
-
-/**
- * Created by panzhao on 2017/3/28.
- */
-public class CarService {
-}
+package com.bsth.server_rs.base_info.car.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.car.Car;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 车辆数据缓存
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+@Order(6)
+public class CarBufferData implements CommandLineRunner {
+
+    private static List<Car> data;
+    private static Map<String, Car> idMap;
+    private static ArrayListMultimap<String, Car> companyListMap;
+
+    @Autowired
+    CarRefreshThread carRefreshThread;
+
+    public static List<Car> findAll(){
+        return data;
+    }
+
+    public static Car findOne(String nbbm){
+        return idMap.get(nbbm);
+    }
+
+    public static List<Car> findByCompany(String company){
+        return companyListMap.get(company);
+    }
+
+    public static void replaceAll(List<Car> newData){
+        data = newData;
+        Map<String, Car> idMapCopy = new HashMap<>();
+        ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
+
+        for(Car car : data){
+            idMapCopy.put(car.getInsideCode(), car);
+            listMap.put(car.getBusinessCode(), car);
+        }
+        idMap = idMapCopy;
+
+        companyListMap = listMap;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(carRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+}
+package com.bsth.server_rs.base_info.car.buffer;
+
+import com.bsth.server_rs.base_info.car.Car;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class CarRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        try {
+
+            List<Car> list = jdbcTemplate.query("select * from bsth_c_cars", BeanPropertyRowMapper.newInstance(Car.class));
+            if(list != null && list.size() > 0)
+                CarBufferData.replaceAll(list);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
 package com.bsth.server_rs.base_info.line;
-import com.bsth.server_rs.adapter.DateAdapter;
+import com.bsth.server_rs.adapter.DateAdapter_yMdHms;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -155,10 +155,6 @@ public class Line implements Serializable {
      */
     private Integer warrantCar;
-    /**
-     * 权证配车启用日期  报表需要的字段值
-     */
-    private Integer warrantDate;
     /**
      * 线路规划类型 <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空
@@ -351,6 +347,7 @@ public class Line implements Serializable {
         this.endPhone = endPhone;
     }
+    @XmlJavaTypeAdapter(DateAdapter_yMdHms.class)
     public Date getOpenDate() {
         return openDate;
     }
@@ -391,14 +388,6 @@ public class Line implements Serializable {
         this.warrantCar = warrantCar;
     }
-    public Integer getWarrantDate() {
-        return warrantDate;
-    }
-
-    public void setWarrantDate(Integer warrantDate) {
-        this.warrantDate = warrantDate;
-    }
-
     public Integer getLinePlayType() {
         return linePlayType;
     }
@@ -415,7 +404,7 @@ public class Line implements Serializable {
         this.descriptions = descriptions;
     }
-    @XmlJavaTypeAdapter(DateAdapter.class)
+    @XmlJavaTypeAdapter(DateAdapter_yMdHms.class)
     public Date getCreateDate() {
         return createDate;
     }
@@ -15,17 +15,23 @@ import java.util.List;
  */
 @Path("/line")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class LineServiceImpl {
+public class LineRestService {
+
+    @GET
+    @Path("/all")
+    public List<Line> findAll(){
+        return LineBufferData.findAll();
+    }
     @GET
     @Path("/company/{companyId}")
-    public List<Line> findAll(@PathParam("companyId") String companyId) {
+    public List<Line> findByCompany(@PathParam("companyId") String companyId) {
         return companyId.equals("-9999") ? LineBufferData.findAll() : LineBufferData.findByCompany(companyId);
     }
     @GET
-    @Path("/{id}")
-    public Line findOne(@PathParam("id") Integer id) {
-        return LineBufferData.findOne(id);
+    @Path("/{lineCode}")
+    public Line findOne(@PathParam("lineCode") String lineCode) {
+        return LineBufferData.findOne(lineCode);
     }
 }
@@ -25,15 +25,15 @@ public class LineBufferData implements CommandLineRunner {
     LineRefreshThread lineRefreshThread;
     private static List<Line> data;
-    private static Map<Integer, Line> idMap;
+    private static Map<String, Line> idMap;
     private static ArrayListMultimap<String, Line> companyListMap;
     public static List<Line> findAll(){
         return data;
     }
-    public static Line findOne(Integer id){
-        return idMap.get(id);
+    public static Line findOne(String lineCode){
+        return idMap.get(lineCode);
     }
     public static List<Line> findByCompany(String company){
@@ -42,11 +42,11 @@ public class LineBufferData implements CommandLineRunner {
     public static void replaceAll(List<Line> newData){
         data = newData;
-        Map<Integer, Line> idMapCopy = new HashMap<>();
+        Map<String, Line> idMapCopy = new HashMap<>();
         ArrayListMultimap<String, Line> listMap = ArrayListMultimap.create();
         for(Line line : data){
-            idMapCopy.put(line.getId(), line);
+            idMapCopy.put(line.getLineCode(), line);
             listMap.put(line.getCompany(), line);
         }
         idMap = idMapCopy;
+package com.bsth.server_rs.base_info.person;
+
+import com.bsth.server_rs.base_info.person.buffer.PersonBufferData;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/28.
+ */
+@Path("/person")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class PersonRestService {
+
+    @GET
+    @Path("/all")
+    public List<Personnel> findAll(){
+        return PersonBufferData.findAll();
+    }
+
+    @GET
+    @Path("/company/{companyId}")
+    public List<Personnel> findByCompany(@PathParam("companyId") String companyId) {
+        return companyId.equals("-9999") ? PersonBufferData.findAll() : PersonBufferData.findByCompany(companyId);
+    }
+
+    @GET
+    @Path("/{workId}")
+    public Personnel findOne(@PathParam("workId") String workId) {
+        return PersonBufferData.findOne(workId);
+    }
+}
-package com.bsth.server_rs.base_info.person;
-
-/**
- * Created by panzhao on 2017/3/28.
- */
-public class PersonService {
-}
+package com.bsth.server_rs.base_info.person;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+/**
+ * @ClassName : Personnel(人员实体类)
+ * @Author : bsth@lq
+ * @Description : TODO(人员)
+ * @Data :2016-04-27
+ * @Version 公交调度系统BS版 0.1
+ */
+@XmlRootElement
+public class Personnel implements Serializable {
+
+    /**
+     * 公司编码
+     */
+    private String companyCode;
+    /**
+     * 分公司编码
+     */
+    private String brancheCompanyCode;
+
+    /**
+     * 工号
+     */
+    private String jobCode;
+    /**
+     * 姓名
+     */
+    private String personnelName;
+
+    /**
+     * 运营服务证书号
+     */
+    private String papersCode;
+    /**
+     * 一卡通工作卡号
+     */
+    private String icCardCode;
+    /**
+     * 性别（字典类型sexType）
+     */
+    private String personnelType;
+    /**
+     * 所属岗位/工种（字典类型gzType）
+     */
+    private String posts;
+
+    /**
+     * 身份证
+     */
+    private String card;
+
+    public String getCard() {
+        return card;
+    }
+
+    public void setCard(String card) {
+        this.card = card;
+    }
+
+    /**
+     * 联系电话（TODO：在原系统里没有，这里暂时留着）
+     */
+    private String telphone;
+
+
+    /**
+     * RFID 人卡IC号
+     */
+    private String icRFID;
+
+    /**
+     * RFID 人卡ID号
+     */
+    private String idRFID;
+
+    /**
+     * RFID 标签号
+     */
+    private String tagRFID;
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
+
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getJobCode() {
+        return jobCode;
+    }
+
+    public void setJobCode(String jobCode) {
+        this.jobCode = jobCode;
+    }
+
+    public String getPersonnelName() {
+        return personnelName;
+    }
+
+    public void setPersonnelName(String personnelName) {
+        this.personnelName = personnelName;
+    }
+
+    public String getPapersCode() {
+        return papersCode;
+    }
+
+    public void setPapersCode(String papersCode) {
+        this.papersCode = papersCode;
+    }
+
+    public String getIcCardCode() {
+        return icCardCode;
+    }
+
+    public void setIcCardCode(String icCardCode) {
+        this.icCardCode = icCardCode;
+    }
+
+    public String getPersonnelType() {
+        return personnelType;
+    }
+
+    public void setPersonnelType(String personnelType) {
+        this.personnelType = personnelType;
+    }
+
+    public String getPosts() {
+        return posts;
+    }
+
+    public void setPosts(String posts) {
+        this.posts = posts;
+    }
+
+    public String getTelphone() {
+        return telphone;
+    }
+
+    public void setTelphone(String telphone) {
+        this.telphone = telphone;
+    }
+
+    public String getIcRFID() {
+        return icRFID;
+    }
+
+    public void setIcRFID(String icRFID) {
+        this.icRFID = icRFID;
+    }
+
+    public String getIdRFID() {
+        return idRFID;
+    }
+
+    public void setIdRFID(String idRFID) {
+        this.idRFID = idRFID;
+    }
+
+    public String getTagRFID() {
+        return tagRFID;
+    }
+
+    public void setTagRFID(String tagRFID) {
+        this.tagRFID = tagRFID;
+    }
+}
+package com.bsth.server_rs.base_info.person.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.person.Personnel;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+@Order(7)
+public class PersonBufferData implements CommandLineRunner {
+
+    @Autowired
+    PersonRefreshThread personRefreshThread;
+
+    private static List<Personnel> data;
+    private static Map<String, Personnel> idMap;
+    private static ArrayListMultimap<String, Personnel> companyListMap;
+
+    public static List<Personnel> findAll() {
+        return data;
+    }
+
+    public static Personnel findOne(String workId) {
+        return idMap.get(workId);
+    }
+
+    public static List<Personnel> findByCompany(String company) {
+        return companyListMap.get(company);
+    }
+
+    public static void replaceAll(List<Personnel> newData) {
+        data = newData;
+        Map<String, Personnel> idMapCopy = new HashMap<>();
+        ArrayListMultimap<String, Personnel> listMap = ArrayListMultimap.create();
+
+        for (Personnel p : data) {
+            idMapCopy.put(p.getJobCode(), p);
+            listMap.put(p.getCompanyCode(), p);
+        }
+        idMap = idMapCopy;
+
+        companyListMap = listMap;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(personRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+}
+package com.bsth.server_rs.base_info.person.buffer;
+
+import com.bsth.server_rs.base_info.person.Personnel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+public class PersonRefreshThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        try {
+            List<Personnel> list = jdbcTemplate.query("select * from bsth_c_personnel",BeanPropertyRowMapper.newInstance(Personnel.class));
+            if(list != null && list.size() > 0)
+                PersonBufferData.replaceAll(list);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
@@ -13,6 +13,7 @@ public class AesException extends RuntimeException {
     public final static int SIGN_CHECK_ERROR = -40001;
     public final static int SIGN_CHECK_FAIL = -40002;
     public final static int INVALID_PWD = -40003;
+    public final static int INVALID_TIMESTAMP = -40004;
     private int code;
@@ -31,7 +32,9 @@ public class AesException extends RuntimeException {
             case SIGN_CHECK_ERROR:
                 return "签名校验时出现异常";
             case SIGN_CHECK_FAIL:
-                return "签名校验失败";
+                return "无效的签名";
+            case INVALID_TIMESTAMP:
+                return "无效的时间戳";
             default:
                 return null;
         }
 package com.bsth.server_rs.exception;
+import com.google.common.base.Splitter;
 import org.apache.cxf.jaxrs.ext.MessageContext;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
+import java.util.List;
 import java.util.Locale;
 /**
@@ -27,8 +29,24 @@ public class AesExceptionMapper implements ExceptionMapper&lt;AesException&gt; {
         rb.entity(entity);
         String accept = mc.getHttpServletRequest().getHeader("Accept");
-        rb.type(accept);
+        rb.type(getAccept(accept));
         rb.language(Locale.SIMPLIFIED_CHINESE);
         return rb.build();
     }
+
+    public String getAccept(String accept){
+        List<String> list = Splitter.on(",").splitToList(accept)
+                ,subList;
+        for(String item : list){
+            subList = Splitter.on(";").splitToList(item);
+            for(String c : subList){
+                if(c.equals("application/xml")
+                        || c.equals("application/json")){
+
+                    return c;
+                }
+            }
+        }
+        return accept;
+    }
 }
+package com.bsth.server_rs.gps;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+/**
+ * 
+ * @ClassName: GpsRealData
+ * @Description: TODO(HTTP接口的实时GPS数据)
+ * @author PanZhao
+ * @date 2016年5月11日 下午4:32:07
+ *
+ */
+@XmlRootElement
+public class GpsEntity implements Serializable{
+
+	/** 公司代码 */
+	private Integer companyCode;
+
+	/** 线路编码 */
+	private String lineId;
+
+	/** 设备编码 */
+	private String deviceId;
+
+	/** 停车场编码 */
+	private String carparkNo;
+
+	/** 站点编码 */
+	private String stopNo;
+	
+	/** 站点名称 */
+	private String stationName;
+
+	/** 经度 */
+	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 Integer upDown;
+	
+	/** 车辆内部编码 */
+	private String nbbm;
+	
+	/** 预计到达终点时间 */
+	private Float expectStopTime;
+
+	private int version;
+
+	/** 异常状态 */
+	private String abnormalStatus;
+
+	/** 越界距离 */
+	private double outOfBoundDistance;
+
+	/** gps是否有效 设备端发送的状态 */
+	private int valid;
+
+	public Integer getCompanyCode() {
+		return companyCode;
+	}
+
+	public void setCompanyCode(Integer companyCode) {
+		this.companyCode = companyCode;
+	}
+
+	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 Float getSpeed() {
+		return speed;
+	}
+
+	public void setSpeed(Float speed) {
+		this.speed = speed;
+	}
+
+	public Float getDirection() {
+		return direction;
+	}
+
+	public void setDirection(Float direction) {
+		this.direction = direction;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Integer getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(Integer upDown) {
+		this.upDown = upDown;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	public Float getExpectStopTime() {
+		return expectStopTime;
+	}
+
+	public void setExpectStopTime(Float expectStopTime) {
+		this.expectStopTime = expectStopTime;
+	}
+
+	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 String getAbnormalStatus() {
+		return abnormalStatus;
+	}
+
+	public void setAbnormalStatus(String abnormalStatus) {
+		this.abnormalStatus = abnormalStatus;
+	}
+
+	public double getOutOfBoundDistance() {
+		return outOfBoundDistance;
+	}
+
+	public void setOutOfBoundDistance(double outOfBoundDistance) {
+		this.outOfBoundDistance = outOfBoundDistance;
+	}
+
+	public int getValid() {
+		return valid;
+	}
+
+	public void setValid(int valid) {
+		this.valid = valid;
+	}
+}
-package com.bsth.server_rs.gps;
-
-/**
- * Created by panzhao on 2017/3/28.
- */
-public class GpsRealService {
-}
+package com.bsth.server_rs.gps;
+
+import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+
+/**
+ * Created by panzhao on 2017/3/28.
+ */
+@Path("/gps")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class GpsRestService {
+
+    @GET
+    @Path("/{deviceId}")
+    public GpsEntity findOne(@PathParam("deviceId") String deviceId){
+        return GpsRealDataBuffer.get(deviceId);
+    }
+
+    @GET
+    @Path("/all")
+    public Collection<GpsEntity> findAll(){
+        return GpsRealDataBuffer.all();
+    }
+}
+package com.bsth.server_rs.gps.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.gps.GpsEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+@Order(8)
+public class GpsRealDataBuffer implements CommandLineRunner {
+
+    private static Map<String, GpsEntity> realMap;
+
+    @Autowired
+    GpsRefreshThread gpsRefreshThread;
+
+    static{
+        realMap = new HashMap<>();
+    }
+
+    public static void put(GpsEntity gps){
+        realMap.put(gps.getDeviceId(), gps);
+    }
+
+    public static GpsEntity get(String device){
+        return realMap.get(device);
+    }
+
+    public static Collection<GpsEntity> all(){
+        return realMap.values();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(gpsRefreshThread, 10, 6, TimeUnit.SECONDS);
+    }
+}
+package com.bsth.server_rs.gps.buffer;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.server_rs.gps.GpsEntity;
+import com.bsth.util.ConfigUtil;
+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;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class GpsRefreshThread extends Thread{
+
+    static String url;
+
+    static {
+        url = ConfigUtil.get("http.gps.real.url");
+    }
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try {
+            CloseableHttpClient httpClient = null;
+            List<GpsEntity> rs = null;
+            httpClient = HttpClients.createDefault();
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(3000).build();
+
+            HttpGet get = new HttpGet(url);
+            get.setConfig(requestConfig);
+
+            CloseableHttpResponse response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+            StringBuffer stringBuffer = new StringBuffer();
+            String str = "";
+            while ((str = br.readLine()) != null)
+                stringBuffer.append(str);
+
+            JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+
+            if (jsonObj != null)
+                rs = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+
+            for(GpsEntity gps : rs){
+                GpsRealDataBuffer.put(gps);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
@@ -32,3 +32,5 @@ spring.redis.port=28008
 http.control.service_data_url= http://127.0.0.1:9088/companyService
 http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
+
+http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
@@ -30,4 +30,6 @@ spring.redis.password=bsth_control_001
 spring.redis.port=28008
 http.control.service_data_url= http://10.10.150.20:9088/companyService
-http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
 \ No newline at end of file
+http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
+
+http.gps.real.url= http://10.10.150.21:8080/transport_server/rtgps/
 \ No newline at end of file