1.站点和站点路由数据结构变更

王通
2 parents f0ffda3f a7dc8893
Showing 29 changed files with 2259 additions and 1638 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/entity/PasswordUser.java
src/main/java/com/bsth/entity/Resource.java
src/main/java/com/bsth/entity/SystemParam.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/repository/SystemParamRepository.java
src/main/java/com/bsth/server_rs/AuthorizeInterceptor_IN.java
src/main/java/com/bsth/server_rs/base_info/car/Car.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/buffer/LineRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/person/Personnel.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonRefreshThread.java
src/main/java/com/bsth/server_rs/base_info/section/buffer/LD_SectionBufferData.java
src/main/java/com/bsth/server_rs/base_info/section/buffer/LD_SectionRefreshThread.java
src/main/java/com/bsth/server_rs/dks/BxRestService.java
src/main/java/com/bsth/server_rs/exception/AesException.java
src/main/java/com/bsth/server_rs/gps/buffer/BasicDataBuffer.java
@@ -13,6 +13,7 @@ import com.bsth.server_rs.base_info.station.StationRestService;
 import com.bsth.server_rs.departure.DepartureRestService;
 import com.bsth.server_rs.destroy.DestroyDetailRestService;
 import com.bsth.server_rs.directive.DirectiveRestService;
+import com.bsth.server_rs.dks.BxRestService;
 import com.bsth.server_rs.electric.ElectricService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
@@ -132,6 +133,8 @@ public class CXFConfig {
     private ManHoursRestService manHoursRestService;
     @Autowired
     private IoCarparkRestService ioCarparkRestService;
+    @Autowired
+    private BxRestService bxRestService;
     @Bean
     public Server rsServer() {
@@ -159,7 +162,8 @@ public class CXFConfig {
                 departureRestService,
                 whiteIpRestService,
                 manHoursRestService,
-                ioCarparkRestService));
+                ioCarparkRestService,
+                bxRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -7,6 +7,7 @@ import com.bsth.server_rs.man_hours.ManHoursRefreshScheduler;
 import com.bsth.server_rs.schedule.real.thread.ExecSchDataRefreshThread;
 import com.bsth.server_rs.schedule.real.thread.SchInOutDataRefreshThread;
 import com.bsth.server_rs.thread.RfidCardInfoPersistenceThread;
+import com.bsth.service.SystemParamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
@@ -37,6 +38,9 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	ManHoursRefreshScheduler manHoursRefreshScheduler;
+	@Autowired
+	SystemParamService systemParamService;
+
 	@Override
 	public void run(String... arg0){
@@ -53,6 +57,7 @@ public class StartCommand implements CommandLineRunner{
 			//定时刷新基础信息
 			Application.mainServices.scheduleWithFixedDelay(basicDataRefreshThread, 30, 30, TimeUnit.MINUTES);
 			manHoursRefreshScheduler.refresh();
+			systemParamService.refresh();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+package com.bsth.common;
+
+/**
+ * @author Hill
+ */
+public class SystemParamKeys {
+
+    public static final String SPECIAL_ROLES = "special.roles";
+
+    public static final String LIMIT_PASSWORDS = "limit.passwords";
+
+    public static final String LIMIT_URIS = "limit.uris";
+
+    public static final String LIMIT_LINES = "limit.lines";
+
+    public static final String LIMIT_DEVICES = "limit.devices";
+}
-package com.bsth.entity;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * 接口 密码 访问用户
- * Created by panzhao on 2017/3/26.
- */
-@Entity
-@Table(name = "interface_user")
-public class PasswordUser {
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-
-    /** 访问密码 */
-    private String pwd;
-
-    /** 调用方名称 */
-    private String callName;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-
-    /** 备注 */
-    private String remark;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPwd() {
-        return pwd;
-    }
-
-    public void setPwd(String pwd) {
-        this.pwd = pwd;
-    }
-
-    public String getCallName() {
-        return callName;
-    }
-
-    public void setCallName(String callName) {
-        this.callName = callName;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-}
+package com.bsth.entity;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 接口 密码 访问用户
+ * Created by panzhao on 2017/3/26.
+ */
+@Entity
+@Table(name = "interface_user")
+public class PasswordUser {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    /** 访问密码 */
+    private String pwd;
+
+    /** 调用方名称 */
+    private String callName;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date createDate;
+
+    /** 备注 */
+    private String remark;
+
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinTable(name = "interface_users_resources",
+            joinColumns = @JoinColumn(name = "user_id"),
+            inverseJoinColumns = @JoinColumn(name = "resource_id"))
+    private List<Resource> resources;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    public String getCallName() {
+        return callName;
+    }
+
+    public void setCallName(String callName) {
+        this.callName = callName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public List<Resource> getResources() {
+        return resources;
+    }
+
+    public void setResources(List<Resource> resources) {
+        this.resources = resources;
+    }
+}
+package com.bsth.entity;
+
+import javax.persistence.*;
+
+/**
+ * @Author Hill
+ */
+@Entity
+@Table(name = "interface_resources")
+public class Resource {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    private String name;
+
+    private String url;
+
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
+package com.bsth.entity;
+
+import javax.persistence.*;
+
+/**
+ * @author Hill
+ */
+@Entity
+@Table(name = "bsth_c_sys_param")
+public class SystemParam {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 键名(唯一)
+     */
+    private String key;
+
+    /**
+     * 值
+     */
+    private String value;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
-package com.bsth.redis;
-
-import com.bsth.Application;
-import com.bsth.entity.SchedulePlanInfo;
-import com.bsth.redis.util.DateUtils;
-import com.bsth.redis.util.RedisUtils;
-import com.bsth.repository.SchedulePlanInfoRepository;
-import com.bsth.server_rs.base_info.line.Line;
-import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
-import com.bsth.util.ConfigUtil;
-import com.bsth.util.ConvertUtil;
-import com.google.common.collect.ArrayListMultimap;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.data.redis.core.ListOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 计调的 计划排班redis缓存
- * Created by panzhao on 2017/3/27.
- */
-@Service
-@Order(6)
-public class PlanScheduleRedisService implements CommandLineRunner {
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Autowired
-    SchedulePlanInfoRepository planInfoRepository;
-
-    @Autowired
-    RedisUtils redisUtils;
-
-    static Logger logger = LoggerFactory.getLogger(PlanScheduleRedisService.class);
-
-    private final static String REDIS_KEY_PREFIX = "plan:";
-
-    /**
-     * 将一批计划写入redis
-     *
-     * @param list
-     */
-    public void wirte(List<SchedulePlanInfo> list) {
-        ArrayListMultimap<String, SchedulePlanInfo> multimap;
-        try {
-            if (list.size() == 0)
-                return;
-            //按日期和线路分组数据
-            Class clazz = SchedulePlanInfo.class;
-            multimap = new ConvertUtil().groupMultiList(list, ":", clazz.getDeclaredField("xlBm"), clazz.getDeclaredField("scheduleDate"));
-
-            //写入redis
-            Iterator<String> iterator = multimap.keySet().iterator();
-            String key;
-            while (iterator.hasNext()) {
-                key = iterator.next();
-                replace(key, multimap.get(key));
-            }
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    /**
-     * 将 list 与redis里的数据合并
-     *
-     * @param key
-     * @param list
-     */
-    public void mergeData(String key, List<SchedulePlanInfo> list) {
-        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
-
-        ListOperations<String, SchedulePlanInfo> ops = redisTemplate.opsForList();
-        List<SchedulePlanInfo> cacheList = ops.range(key, 0, -1);
-
-        for (SchedulePlanInfo plan : cacheList) {
-            if (!list.contains(plan))
-                list.add(plan);
-        }
-
-        //更新
-        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
-    }
-
-    /**
-     * 覆盖数据
-     *
-     * @param key
-     * @param list
-     */
-    public void replace(String key, List<SchedulePlanInfo> list) {
-        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
-        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
-    }
-
-    /**
-     * 根据日期和线路编码从redis获取计划
-     *
-     * @param dateStr
-     * @param lineCode
-     * @return
-     */
-    public List<SchedulePlanInfo> read(String dateStr, String lineCode) {
-        return redisTemplate.opsForList().range(REDIS_KEY_PREFIX + lineCode + ":" + dateStr, 0, -1);
-    }
-
-
-    @Autowired
-    PlanClearThread planClearThread;
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.schedule(new Runnable() {
-            @Override
-            public void run() {
-                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
-                //设置key 序列化器
-                redisTemplate.setKeySerializer(new StringRedisSerializer());
-
-                DateTime dt = new DateTime();
-                dt = dt.minusDays(cacheDays);
-                dt = dt.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0).minusDays(cacheDays);
-                List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(dt.toDate(), new Date());
-                //写入redis
-                wirte(list);
-            }
-        }, 60 * 5, TimeUnit.SECONDS);
-
-
-        //定时 00:05 分清理计划，并加载当天的计划
-        long diff = (DateUtils.getTimestamp() + 1000 * 60 * 5) - System.currentTimeMillis();
-        if (diff < 0)
-            diff += (1000 * 60 * 60 * 24);
-        Application.mainServices.scheduleAtFixedRate(planClearThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-    }
-
-    public List<SchedulePlanInfo> findByMultiLine(List<String> lineArray, String rq) {
-        rq = rq.replaceAll("-", "");
-        List<SchedulePlanInfo> rs = new ArrayList<>();
-        for (String lineCode : lineArray) {
-            rs.addAll(read(rq, lineCode));
-        }
-        return rs;
-    }
-
-    @Component
-    public static class PlanClearThread extends Thread {
-
-        @Autowired
-        PlanScheduleRedisService planRedisService;
-        @Autowired
-        SchedulePlanInfoRepository planInfoRepository;
-
-        @Override
-        public void run() {
-            try {
-                logger.info("redis -清理计划排班");
-
-                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
-                DateTime dt = new DateTime();
-                dt = dt.minusDays(cacheDays);
-                String rq = dt.toString("yyyy-MM-dd");
-
-                List<Line> lines = LineBufferData.findAll();
-                for (Line line : lines) {
-                    planRedisService.delete(line.getLineCode(), rq);
-                }
-
-                //加载当天的计划
-                Date d = new Date();
-                Date s = new Date(d.getTime() - 1000 * 60 * 60 * 24);
-                List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(s, d);
-                //写入redis
-                planRedisService.wirte(list);
-            } catch (Exception e) {
-                logger.error("", e);
-            }
-        }
-    }
-
-    private void delete(String lineCode, String rq) {
-        String key = REDIS_KEY_PREFIX + (lineCode + ":" + rq).replaceAll("-", "");
-        redisTemplate.delete(key);
-    }
-}
+package com.bsth.redis;
+
+import com.bsth.Application;
+import com.bsth.entity.SchedulePlanInfo;
+import com.bsth.redis.util.DateUtils;
+import com.bsth.redis.util.RedisUtils;
+import com.bsth.repository.SchedulePlanInfoRepository;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.util.ConfigUtil;
+import com.bsth.util.ConvertUtil;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 计调的 计划排班redis缓存
+ * Created by panzhao on 2017/3/27.
+ */
+@Service
+@Order(6)
+public class PlanScheduleRedisService implements CommandLineRunner {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    SchedulePlanInfoRepository planInfoRepository;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    static Logger logger = LoggerFactory.getLogger(PlanScheduleRedisService.class);
+
+    private final static String REDIS_KEY_PREFIX = "plan:";
+
+    /**
+     * 将一批计划写入redis
+     *
+     * @param list
+     */
+    public void wirte(List<SchedulePlanInfo> list) {
+        ArrayListMultimap<String, SchedulePlanInfo> multimap;
+        try {
+            if (list.size() == 0)
+                return;
+            //按日期和线路分组数据
+            Class clazz = SchedulePlanInfo.class;
+            multimap = new ConvertUtil().groupMultiList(list, ":", clazz.getDeclaredField("xlBm"), clazz.getDeclaredField("scheduleDate"));
+
+            //写入redis
+            Iterator<String> iterator = multimap.keySet().iterator();
+            String key;
+            while (iterator.hasNext()) {
+                key = iterator.next();
+                replace(key, multimap.get(key));
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 将 list 与redis里的数据合并
+     *
+     * @param key
+     * @param list
+     */
+    public void mergeData(String key, List<SchedulePlanInfo> list) {
+        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
+
+        ListOperations<String, SchedulePlanInfo> ops = redisTemplate.opsForList();
+        List<SchedulePlanInfo> cacheList = ops.range(key, 0, -1);
+
+        for (SchedulePlanInfo plan : cacheList) {
+            if (!list.contains(plan))
+                list.add(plan);
+        }
+
+        //更新
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
+    }
+
+    /**
+     * 覆盖数据
+     *
+     * @param key
+     * @param list
+     */
+    public void replace(String key, List<SchedulePlanInfo> list) {
+        key = REDIS_KEY_PREFIX + key.replaceAll("-", "");
+        redisTemplate.execute(redisUtils.getUpdateCallback(key, list));
+    }
+
+    /**
+     * 根据日期和线路编码从redis获取计划
+     *
+     * @param dateStr
+     * @param lineCode
+     * @return
+     */
+    public List<SchedulePlanInfo> read(String dateStr, String lineCode) {
+        return redisTemplate.opsForList().range(REDIS_KEY_PREFIX + lineCode + ":" + dateStr, 0, -1);
+    }
+
+
+    @Autowired
+    PlanClearThread planClearThread;
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.schedule(new Runnable() {
+            @Override
+            public void run() {
+                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+                //设置key 序列化器
+                redisTemplate.setKeySerializer(new StringRedisSerializer());
+
+                DateTime dt = new DateTime();
+                dt = dt.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0);
+                List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(dt.minusDays(cacheDays).toDate(), dt.plusDays(1).toDate());
+                //写入redis
+                wirte(list);
+            }
+        }, 20, TimeUnit.SECONDS);
+
+
+        //定时 00:05 分清理计划，并加载当天的计划
+        long diff = (DateUtils.getTimestamp() + 1000 * 60 * 5) - System.currentTimeMillis();
+        if (diff < 0)
+            diff += (1000 * 60 * 60 * 24);
+        Application.mainServices.scheduleAtFixedRate(planClearThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+    }
+
+    public List<SchedulePlanInfo> findByMultiLine(List<String> lineArray, String rq) {
+        rq = rq.replaceAll("-", "");
+        List<SchedulePlanInfo> rs = new ArrayList<>();
+        for (String lineCode : lineArray) {
+            rs.addAll(read(rq, lineCode));
+        }
+        return rs;
+    }
+
+    @Component
+    public static class PlanClearThread extends Thread {
+
+        @Autowired
+        PlanScheduleRedisService planRedisService;
+        @Autowired
+        SchedulePlanInfoRepository planInfoRepository;
+
+        @Override
+        public void run() {
+            try {
+                logger.info("redis -清理计划排班");
+
+                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+                DateTime dt = new DateTime();
+                dt = dt.minusDays(cacheDays);
+                String rq = dt.toString("yyyy-MM-dd");
+
+                List<Line> lines = LineBufferData.findAll();
+                for (Line line : lines) {
+                    planRedisService.delete(line.getLineCode(), rq);
+                }
+
+                //加载明天的计划
+                DateTime d = new DateTime();
+                d.withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0);
+                List<SchedulePlanInfo> list = planInfoRepository.findByDateRange(d.toDate(), d.plusDays(1).toDate());
+                //写入redis
+                planRedisService.wirte(list);
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
+
+    private void delete(String lineCode, String rq) {
+        String key = REDIS_KEY_PREFIX + (lineCode + ":" + rq).replaceAll("-", "");
+        redisTemplate.delete(key);
+    }
+}
+package com.bsth.repository;
+
+import com.bsth.entity.SystemParam;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+/**
+ * @author Hill
+ */
+public interface SystemParamRepository extends PagingAndSortingRepository<SystemParam, Integer> {
+}
-package com.bsth.server_rs;
-
-import com.bsth.server_rs.exception.AesException;
-import com.bsth.service.UserService;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
-import org.eclipse.jetty.util.MultiMap;
-import org.eclipse.jetty.util.UrlEncoded;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.security.MessageDigest;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * rest 接口授权校验（IN 输入拦截）
- * Created by panzhao on 2017/3/28.
- */
-@Component
-public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor<Message> implements ApplicationContextAware {
-
-    private static final String SIGN = "sign";
-    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;
-    private static Map<String, String> pwd2nonceMap;
-
-    static UserService userService;
-
-    static Logger logger = LoggerFactory.getLogger(AuthorizeInterceptor_IN.class);
-
-    public AuthorizeInterceptor_IN() {
-        super(Phase.RECEIVE);
-    }
-
-    static {
-        pwd2nonceMap = new HashMap<>();
-    }
-
-    @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);
-        }
-
-        //放行wadl
-        if(message.get(Message.QUERY_STRING).equals("_wadl")
-                && message.get(Message.PATH_INFO).equals("/webservice/rest")){
-            return ;
-        }
-
-        //获取参数，不包括 url 路径参数  只包括?号之后的
-        String queryString = StringEscapeUtils.unescapeHtml4(message.get(Message.QUERY_STRING).toString());
-        MultiMap<String> params = new MultiMap<>();
-        UrlEncoded.decodeTo(queryString, params, "utf-8");
-        Map<String, String> map = multi2One(params);
-
-        if (!map.containsKey(SIGN)) {
-            throw new AesException(AesException.MISS_SIGN);
-        }
-        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);
-        }
-        if (!map.containsKey(PASSWORD)) {
-            throw new AesException(AesException.MISS_PWD);
-        }
-
-        String prevNonce = pwd2nonceMap.get(map.get(PASSWORD));
-        if(prevNonce != null && prevNonce.equals(map.get(NONCE)))
-            throw new AesException(AesException.NO_RANDOM_NONCE);
-
-        if (userService.get(map.get(PASSWORD)) == null) {
-            throw new AesException(AesException.INVALID_PWD);
-        }
-
-        String sign = map.get(SIGN);
-        map.remove(SIGN);
-        String sh1 = "";
-        try {
-            sh1 = getSHA1(map);
-        } catch (Exception e) {
-            throw new AesException(AesException.SIGN_CHECK_ERROR);
-        }
-
-        if (!sign.equals(sh1)) {
-            throw new AesException(AesException.SIGN_CHECK_FAIL);
-        }
-    }
-
-    public static Map<String, String> multi2One(MultiMap<String> params) {
-        Map<String, String> map = new HashMap<>();
-        Set<String> ks = params.keySet();
-        for (String k : ks) {
-            map.put(k, params.getString(k));
-        }
-        return map;
-    }
-
-
-    public static String getSHA1(Map<String, String> map) throws Exception {
-
-        try {
-            String[] array = new String[map.size()];
-            map.values().toArray(array);
-            StringBuffer sb = new StringBuffer();
-
-            // 字符串排序
-            Arrays.sort(array);
-            for (int i = 0; i < array.length; i++) {
-                sb.append(array[i]);
-            }
-            String str = sb.toString();
-            // SHA1签名生成
-            MessageDigest md = MessageDigest.getInstance("SHA-1");
-            md.update(str.getBytes());
-            byte[] digest = md.digest();
-
-            StringBuffer hexstr = new StringBuffer();
-            String shaHex = "";
-            for (int i = 0; i < digest.length; i++) {
-                shaHex = Integer.toHexString(digest[i] & 0xFF);
-                if (shaHex.length() < 2) {
-                    hexstr.append(0);
-                }
-                hexstr.append(shaHex);
-            }
-            return hexstr.toString();
-        } catch (Exception e) {
-            logger.error("", e);
-            throw e;
-        }
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        userService = applicationContext.getBean(UserService.class);
-    }
-}
+package com.bsth.server_rs;
+
+import com.bsth.entity.PasswordUser;
+import com.bsth.entity.Resource;
+import com.bsth.server_rs.exception.AesException;
+import com.bsth.service.SystemParamService;
+import com.bsth.service.UserService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.eclipse.jetty.util.MultiMap;
+import org.eclipse.jetty.util.UrlEncoded;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
+
+import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * rest 接口授权校验（IN 输入拦截）
+ * Created by panzhao on 2017/3/28.
+ */
+@Component
+public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor<Message> implements ApplicationContextAware {
+
+    private static final String SIGN = "sign";
+    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;
+    private static Map<String, String> pwd2nonceMap;
+
+    static UserService userService;
+
+    static SystemParamService systemParamService;
+
+    static Logger logger = LoggerFactory.getLogger(AuthorizeInterceptor_IN.class);
+
+    private static PathMatcher matcher = new AntPathMatcher();
+
+    public AuthorizeInterceptor_IN() {
+        super(Phase.RECEIVE);
+    }
+
+    static {
+        pwd2nonceMap = new HashMap<>();
+    }
+
+    @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);
+        }
+
+        //放行wadl
+        if(message.get(Message.QUERY_STRING).equals("_wadl")
+                && message.get(Message.PATH_INFO).equals("/webservice/rest")){
+            return ;
+        }
+
+        //获取参数，不包括 url 路径参数  只包括?号之后的
+        String queryString = StringEscapeUtils.unescapeHtml4(message.get(Message.QUERY_STRING).toString());
+        MultiMap<String> params = new MultiMap<>();
+        UrlEncoded.decodeTo(queryString, params, "utf-8");
+        Map<String, String> map = multi2One(params);
+
+        if (!map.containsKey(SIGN)) {
+            throw new AesException(AesException.MISS_SIGN);
+        }
+        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);
+        }
+        if (!map.containsKey(PASSWORD)) {
+            throw new AesException(AesException.MISS_PWD);
+        }
+
+        String prevNonce = pwd2nonceMap.get(map.get(PASSWORD));
+        if(prevNonce != null && prevNonce.equals(map.get(NONCE)))
+            throw new AesException(AesException.NO_RANDOM_NONCE);
+
+        if (userService.get(map.get(PASSWORD)) == null) {
+            throw new AesException(AesException.INVALID_PWD);
+        }
+
+        String sign = map.get(SIGN);
+        map.remove(SIGN);
+        String sh1 = "";
+        try {
+            sh1 = getSHA1(map);
+        } catch (Exception e) {
+            throw new AesException(AesException.SIGN_CHECK_ERROR);
+        }
+
+        if (!sign.equals(sh1)) {
+            throw new AesException(AesException.SIGN_CHECK_FAIL);
+        }
+
+        validate(map, message);
+    }
+
+    private static void validate(Map<String, String> map, Message message) {
+        PasswordUser user = userService.get(map.get(PASSWORD));
+        if (user.getResources().size() > 0) {
+            boolean isMatch = false;
+            String uri = (String) message.get(Message.REQUEST_URI);
+            for (Resource resource : user.getResources()) {
+                if (matcher.match(resource.getUrl(), uri)) {
+                    isMatch = true;
+                    break;
+                }
+            }
+            if (!isMatch) {
+                throw new AesException(AesException.INVALID_URI);
+            }
+        }
+    }
+
+    public static Map<String, String> multi2One(MultiMap<String> params) {
+        Map<String, String> map = new HashMap<>();
+        Set<String> ks = params.keySet();
+        for (String k : ks) {
+            map.put(k, params.getString(k));
+        }
+        return map;
+    }
+
+
+    public static String getSHA1(Map<String, String> map) throws Exception {
+
+        try {
+            String[] array = new String[map.size()];
+            map.values().toArray(array);
+            StringBuffer sb = new StringBuffer();
+
+            // 字符串排序
+            Arrays.sort(array);
+            for (int i = 0; i < array.length; i++) {
+                sb.append(array[i]);
+            }
+            String str = sb.toString();
+            // SHA1签名生成
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            md.update(str.getBytes());
+            byte[] digest = md.digest();
+
+            StringBuffer hexstr = new StringBuffer();
+            String shaHex = "";
+            for (int i = 0; i < digest.length; i++) {
+                shaHex = Integer.toHexString(digest[i] & 0xFF);
+                if (shaHex.length() < 2) {
+                    hexstr.append(0);
+                }
+                hexstr.append(shaHex);
+            }
+            return hexstr.toString();
+        } catch (Exception e) {
+            logger.error("", e);
+            throw e;
+        }
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        userService = applicationContext.getBean(UserService.class);
+        systemParamService = applicationContext.getBean(SystemParamService.class);
+    }
+}
-package com.bsth.server_rs.base_info.car;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-
-/**
- * 车辆信息
- * Created by panzhao on 2017/3/30.
- */
-@XmlRootElement
-public class Car implements Serializable {
-
-    /**
-     * 自编号/内部编号
-     */
-    private String nbbm;
-
-    /**
-     * 公司代码
-     */
-    private String companyCode;
-    /**
-     * 分公司编码
-     */
-    private String brancheCompanyCode;
-
-    /**
-     * 车牌号
-     */
-    private String carPlate;
-    /**
-     * 设备终端号
-     */
-    private String equipmentCode;
-    /**
-     * 车辆类型
-     */
-    private String carType;
-    /**
-     * 是否机动车（机动车类型选择）
-     */
-    private String vehicleStats;
-
-    /**
-     * 是否电车（TODO：在原系统里没有，这里暂时留着）
-     */
-    private Boolean sfdc;
-    /**
-     * 是否报废
-     */
-    private Boolean scrapState;
-
-    /**
-     * RFID 车卡ID号（16进制）
-     */
-    private String idRfid;
-
-    /**
-     * RFID 标签号
-     */
-    private String tagRfid;
-
-    private String lineCode;
-
-    private String lineName;
-
-    private String remark;
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    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 getCarPlate() {
-        return carPlate;
-    }
-
-    public void setCarPlate(String carPlate) {
-        this.carPlate = carPlate;
-    }
-
-    public String getEquipmentCode() {
-        return equipmentCode;
-    }
-
-    public void setEquipmentCode(String equipmentCode) {
-        this.equipmentCode = equipmentCode;
-    }
-
-    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 Boolean getSfdc() {
-        return sfdc;
-    }
-
-    public void setSfdc(Boolean sfdc) {
-        this.sfdc = sfdc;
-    }
-
-    public Boolean getScrapState() {
-        return scrapState;
-    }
-
-    public void setScrapState(Boolean scrapState) {
-        this.scrapState = scrapState;
-    }
-
-    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;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-}
+package com.bsth.server_rs.base_info.car;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 车辆信息
+ * Created by panzhao on 2017/3/30.
+ */
+@XmlRootElement
+public class Car implements Serializable {
+
+    /**
+     * 自编号/内部编号
+     */
+    private String nbbm;
+
+    /**
+     * 公司代码
+     */
+    private String companyCode;
+    /**
+     * 分公司编码
+     */
+    private String brancheCompanyCode;
+
+    /**
+     * 车牌号
+     */
+    private String carPlate;
+    /**
+     * 设备终端号
+     */
+    private String equipmentCode;
+    /**
+     * 车辆类型
+     */
+    private String carType;
+    /**
+     * 是否机动车（机动车类型选择）
+     */
+    private String vehicleStats;
+
+    /**
+     * 是否电车（TODO：在原系统里没有，这里暂时留着）
+     */
+    private Boolean sfdc;
+    /**
+     * 是否报废
+     */
+    private Boolean scrapState;
+
+    /**
+     * RFID 车卡ID号（16进制）
+     */
+    private String idRfid;
+
+    /**
+     * RFID 标签号
+     */
+    private String tagRfid;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String remark;
+
+    private Date updateDate;
+
+    private String vehicleType;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    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 getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    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 Boolean getSfdc() {
+        return sfdc;
+    }
+
+    public void setSfdc(Boolean sfdc) {
+        this.sfdc = sfdc;
+    }
+
+    public Boolean getScrapState() {
+        return scrapState;
+    }
+
+    public void setScrapState(Boolean scrapState) {
+        this.scrapState = scrapState;
+    }
+
+    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;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getVehicleType() {
+        return vehicleType;
+    }
+
+    public void setVehicleType(String vehicleType) {
+        this.vehicleType = vehicleType;
+    }
+}
-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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 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 DISTINCT t1.*,t2.line_code,t2.name as line_name FROM(SELECT c.inside_code as nbbm,c.business_code as company_code,c.branche_company_code,c.car_plate,c.equipment_code,c.car_type,c.vehicle_stats,c.sfdc,c.scrap_state,c.id_rfid,c.tag_rfid,c2.xl,c2.qyrq FROM bsth_c_cars c LEFT JOIN bsth_c_s_ccinfo c2 ON c.id = c2.cl and c2.is_cancel=0) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id ORDER BY nbbm,qyrq"
-                    , BeanPropertyRowMapper.newInstance(Car.class));
-
-            Map<String, Car> map = new HashMap<>();
-            //过滤数据，多条线路配车的保留一条
-            for(Car c : list){
-                map.put(c.getNbbm(), c);
-            }
-
-            if(list != null && list.size() > 0)
-                CarBufferData.replaceAll(new ArrayList(map.values()));
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 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 DISTINCT t1.*,t2.line_code,t2.name as line_name FROM(SELECT c.inside_code as nbbm,c.business_code as company_code,c.branche_company_code,c.car_plate,c.equipment_code,c.car_type,c.vehicle_stats,c.sfdc,c.scrap_state,c.id_rfid,c.tag_rfid,c.update_date,c2.xl,c2.qyrq,c.vehicle_type FROM bsth_c_cars c LEFT JOIN bsth_c_s_ccinfo c2 ON c.id = c2.cl and c2.is_cancel=0) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id ORDER BY nbbm,qyrq"
+                    , BeanPropertyRowMapper.newInstance(Car.class));
+
+            Map<String, Car> map = new HashMap<>();
+            //过滤数据，多条线路配车的保留一条
+            for(Car c : list){
+                map.put(c.getNbbm(), c);
+            }
+
+            if(list != null && list.size() > 0)
+                CarBufferData.replaceAll(new ArrayList(map.values()));
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
@@ -125,6 +125,16 @@ public class Line implements Serializable {
      */
     private Date revokeDate;
+    /**
+     * 停车场编码
+     */
+    private String carPark;
+
+    /**
+     * 坐标点
+     */
+    private String coordinates;
+
     public String getName() {
         return name;
     }
@@ -381,4 +391,20 @@ public class Line implements Serializable {
     public void setRevokeDate(Date revokeDate) {
         this.revokeDate = revokeDate;
     }
+
+    public String getCarPark() {
+        return carPark;
+    }
+
+    public void setCarPark(String carPark) {
+        this.carPark = carPark;
+    }
+
+    public String getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(String coordinates) {
+        this.coordinates = coordinates;
+    }
 }
@@ -28,7 +28,7 @@ public class LineRefreshThread extends Thread{
     public void run() {
         try {
-            List<Line> list = jdbcTemplate.query("SELECT t1. NAME,t1.line_code,t1.start_station_name,t1.end_station_name,t1.start_station_first_time,t1.start_station_end_time,t1.end_station_first_time,t1.end_station_end_time,t1.company,t1.branche_company,t1.nature,t1.`level`,t1.destroy,t1.supper_line,t1.eq_linecode,t1.create_date,t2.total_mileage,t2.early_interval_lg,t2.late_interval_lg,t2.interval_lg,t2.speed_limit,t2.lag_station,t2.skip,t2.speeding,t2.crossed_line,t2.overflights,t1.shanghai_linecode, t1.line_play_type, t1.region, t1.in_use, t3.business_name company_name,t1.revoke_date FROM bsth_c_line t1 LEFT JOIN bsth_c_line_information t2 ON t1.id = t2.line LEFT JOIN bsth_c_business t3 on t1.company = t3.business_code",
+            List<Line> list = jdbcTemplate.query("SELECT t1. NAME,t1.line_code,t1.start_station_name,t1.end_station_name,t1.start_station_first_time,t1.start_station_end_time,t1.end_station_first_time,t1.end_station_end_time,t1.company,t1.branche_company,t1.nature,t1.`level`,t1.destroy,t1.supper_line,t1.eq_linecode,t1.create_date,t2.total_mileage,t2.early_interval_lg,t2.late_interval_lg,t2.interval_lg,t2.speed_limit,t2.lag_station,t2.skip,t2.speeding,t2.crossed_line,t2.overflights,t1.shanghai_linecode, t1.line_play_type, t1.region, t1.in_use, t3.business_name company_name,t1.revoke_date,t2.car_park FROM bsth_c_line t1 LEFT JOIN bsth_c_line_information t2 ON t1.id = t2.line LEFT JOIN bsth_c_business t3 on t1.company = t3.business_code",
                     BeanPropertyRowMapper.newInstance(Line.class));
             Map<String, Line> map = new HashMap<>(), revokeMap = new HashMap<>();
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
+import java.util.Date;
 /**
  * @ClassName : Personnel(人员实体类)
@@ -53,6 +54,7 @@ public class Personnel implements Serializable {
     /**
      * 身份证
      */
+    @JsonIgnore
     private String card;
     public String getCard() {
@@ -104,6 +106,8 @@ public class Personnel implements Serializable {
      */
     private String jdCodeori;
+    private Date updateDate;
+
     public String getCompanyCode() {
         return companyCode;
     }
@@ -231,4 +235,12 @@ public class Personnel implements Serializable {
     public void setJdCodeori(String jdCodeori) {
         this.jdCodeori = jdCodeori;
     }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
 }
@@ -28,13 +28,12 @@ public class PersonRefreshThread extends Thread{
     public void run() {
         try {
-            List<Personnel> list = jdbcTemplate.query("select DISTINCT t1.*,t2.name as line_name,t2.line_code  from (SELECT company_code,branche_company_code,job_code,personnel_name,papers_code,ic_card_code,personnel_type,posts,card,telphone,ic_rfid,id_rfid,tag_rfid,jd_codeori,e.xl FROM bsth_c_personnel p left JOIN bsth_c_s_ecinfo e on p.id=e.jsy) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id "
+            List<Personnel> list = jdbcTemplate.query("select DISTINCT t1.*,t2.name as line_name,t2.line_code  from (SELECT company_code,branche_company_code,job_code,personnel_name,papers_code,ic_card_code,personnel_type,posts,card,telphone,ic_rfid,id_rfid,tag_rfid,jd_codeori,p.update_date,e.xl FROM bsth_c_personnel p left JOIN bsth_c_s_ecinfo e on p.id=e.jsy) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id "
                     ,BeanPropertyRowMapper.newInstance(Personnel.class));
             Map<String, Personnel> map = new HashMap<>();
             //过滤数据，多条线路配人的保留一条
             for(Personnel p : list){
-                p.setCard("");
                 map.put(p.getJobCode(), p);
             }
-package com.bsth.server_rs.base_info.section.buffer;
-
-import com.bsth.Application;
-import com.bsth.server_rs.base_info.line.Line;
-import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
-import com.bsth.server_rs.base_info.section.entity.LD_Section;
-import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
-import com.bsth.server_rs.base_info.section.entity.RoadSpeed;
-import com.google.common.collect.ArrayListMultimap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 站点数据缓存（自更新）
- * Created by panzhao on 2017/3/27.
- */
-@Component
-@Order(6)
-public class LD_SectionBufferData implements CommandLineRunner {
-
-
-    private static List<LD_Section> data;
-    private static Map<String, LD_Section> codeMap;
-
-    /**
-     * 线路名称和路段集合映射
-     */
-    private static Map<String, List<LD_SectionRoute>> name2sections = new ConcurrentHashMap<>();
-
-    //路段限速缓存信息
-    private static List<RoadSpeed> roadSpeedList;
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    LD_SectionRefreshThread ld_sectionRefreshThread;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    /**
-        路由缓存
-        线路编码_上下行 ——> 路由集合
-     */
-    private static ArrayListMultimap<String, LD_SectionRoute> routeListMap;
-
-
-    public static List<LD_Section> findAll(){
-        return data;
-    }
-
-    public static Map<String, Collection<LD_SectionRoute>> findAllRoute(){
-        return routeListMap.asMap();
-    }
-
-    public static LD_Section findOne(String code){
-        return codeMap.get(code);
-    }
-
-    public static void replaceAll(List<LD_Section> newData){
-        data = newData;
-        Map<String, LD_Section> codeMapCopy = new HashMap<>();
-        for(LD_Section section : data){
-            codeMapCopy.put(section.getSectionCode(), section);
-        }
-
-        codeMap = codeMapCopy;
-    }
-
-    public static void putRoadSpeeds(List<RoadSpeed> list){
-        roadSpeedList = list;
-    }
-
-    public static void replaceRoutes(List<LD_SectionRoute> list){
-        Collections.sort(list, new Comparator<LD_SectionRoute>() {
-            @Override
-            public int compare(LD_SectionRoute o1, LD_SectionRoute o2) {
-                return o1.getSectionrouteCode().compareTo(o2.getSectionrouteCode());
-            }
-        });
-
-        ArrayListMultimap<String, LD_SectionRoute> routeListMapCopy = ArrayListMultimap.create();
-        for(LD_SectionRoute sr : list){
-            routeListMapCopy.put(sr.getLineCode()+"_" + sr.getDirections(), sr);
-        }
-
-        routeListMap = routeListMapCopy;
-    }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(ld_sectionRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
-    }
-
-    public Map<String, Collection<LD_SectionRoute>> findRouteByCompany(String company) {
-        List<Line> lines = LineBufferData.findByCompany(company);
-
-        ArrayListMultimap<String, LD_SectionRoute> listMap = ArrayListMultimap.create();
-
-
-        Set<String> ks = routeListMap.keySet();
-
-        for(String k : ks){
-            if(include(lines, k)){
-                listMap.putAll(k, routeListMap.get(k));
-            }
-        }
-        return listMap.asMap();
-    }
-
-    private static boolean include(List<Line> lines, String k){
-
-        for(Line line : lines){
-            if(k.startsWith(line.getLineCode() + "_"))
-                return true;
-        }
-        return false;
-    }
-
-    public List<RoadSpeed> roadSpeedList(String company) {
-        return roadSpeedList;
-    }
-
-    public Map<String, Collection<LD_SectionRoute>> findByLineCode(String lineCode) {
-
-        ArrayListMultimap<String, LD_SectionRoute> listMap = ArrayListMultimap.create();
-
-        String k1 = lineCode + "_0";
-        String k2 = lineCode + "_1";
-
-        listMap.putAll(k1, routeListMap.get(k1));
-        listMap.putAll(k2, routeListMap.get(k2));
-        return listMap.asMap();
-    }
-
-    public static void putLastedRoute(Map<String, List<LD_SectionRoute>> map) {
-        name2sections = map;
-    }
-
-    public List<LD_SectionRoute> findByLineName(String lineName) {
-        return name2sections.get(lineName);
-    }
-}
+package com.bsth.server_rs.base_info.section.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.base_info.section.entity.LD_Section;
+import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
+import com.bsth.server_rs.base_info.section.entity.RoadSpeed;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 站点数据缓存（自更新）
+ * Created by panzhao on 2017/3/27.
+ */
+@Component
+@Order(6)
+public class LD_SectionBufferData implements CommandLineRunner {
+
+
+    private static List<LD_Section> data;
+    private static Map<String, LD_Section> codeMap;
+
+    /**
+     * 线路名称和路段集合映射
+     */
+    private static Map<String, List<LD_SectionRoute>> name2sections = new ConcurrentHashMap<>();
+
+    //路段限速缓存信息
+    private static List<RoadSpeed> roadSpeedList = new ArrayList<>();
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    LD_SectionRefreshThread ld_sectionRefreshThread;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+        路由缓存
+        线路编码_上下行 ——> 路由集合
+     */
+    private static ArrayListMultimap<String, LD_SectionRoute> routeListMap;
+
+
+    public static List<LD_Section> findAll(){
+        return data;
+    }
+
+    public static Map<String, Collection<LD_SectionRoute>> findAllRoute(){
+        return routeListMap.asMap();
+    }
+
+    public static LD_Section findOne(String code){
+        return codeMap.get(code);
+    }
+
+    public static void replaceAll(List<LD_Section> newData){
+        data = newData;
+        Map<String, LD_Section> codeMapCopy = new HashMap<>();
+        for(LD_Section section : data){
+            codeMapCopy.put(section.getSectionCode(), section);
+        }
+
+        codeMap = codeMapCopy;
+    }
+
+    public static void putRoadSpeeds(List<RoadSpeed> list){
+        roadSpeedList = list;
+    }
+
+    public static void replaceRoutes(List<LD_SectionRoute> list){
+        Collections.sort(list, new Comparator<LD_SectionRoute>() {
+            @Override
+            public int compare(LD_SectionRoute o1, LD_SectionRoute o2) {
+                return o1.getSectionrouteCode().compareTo(o2.getSectionrouteCode());
+            }
+        });
+
+        ArrayListMultimap<String, LD_SectionRoute> routeListMapCopy = ArrayListMultimap.create();
+        for(LD_SectionRoute sr : list){
+            routeListMapCopy.put(sr.getLineCode()+"_" + sr.getDirections(), sr);
+        }
+
+        routeListMap = routeListMapCopy;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(ld_sectionRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+
+    public Map<String, Collection<LD_SectionRoute>> findRouteByCompany(String company) {
+        List<Line> lines = LineBufferData.findByCompany(company);
+
+        ArrayListMultimap<String, LD_SectionRoute> listMap = ArrayListMultimap.create();
+
+
+        Set<String> ks = routeListMap.keySet();
+
+        for(String k : ks){
+            if(include(lines, k)){
+                listMap.putAll(k, routeListMap.get(k));
+            }
+        }
+        return listMap.asMap();
+    }
+
+    private static boolean include(List<Line> lines, String k){
+
+        for(Line line : lines){
+            if(k.startsWith(line.getLineCode() + "_"))
+                return true;
+        }
+        return false;
+    }
+
+    public List<RoadSpeed> roadSpeedList(String company) {
+        return roadSpeedList;
+    }
+
+    public Map<String, Collection<LD_SectionRoute>> findByLineCode(String lineCode) {
+
+        ArrayListMultimap<String, LD_SectionRoute> listMap = ArrayListMultimap.create();
+
+        String k1 = lineCode + "_0";
+        String k2 = lineCode + "_1";
+
+        listMap.putAll(k1, routeListMap.get(k1));
+        listMap.putAll(k2, routeListMap.get(k2));
+        return listMap.asMap();
+    }
+
+    public static void putLastedRoute(Map<String, List<LD_SectionRoute>> map) {
+        name2sections = map;
+    }
+
+    public List<LD_SectionRoute> findByLineName(String lineName) {
+        return name2sections.get(lineName);
+    }
+}
@@ -63,9 +63,9 @@ public class LD_SectionRefreshThread extends Thread{
             IoCarparkBufferData.replaceRoutes(routeList1);
             //查询路段限速信息
-            List<RoadSpeed> roadSpeedList = jdbcTemplate.query("select id,name,ST_AsText(g_road_vector) as g_road_vector,speed,speed_start_date,speed_end_date,line,is_start,create_date,update_date from bsth_c_road_speed where is_start=0", BeanPropertyRowMapper.newInstance(RoadSpeed.class));
-            if(roadSpeedList.size() > 0)
-                LD_SectionBufferData.putRoadSpeeds(roadSpeedList);
+//            List<RoadSpeed> roadSpeedList = jdbcTemplate.query("select id,name,ST_AsText(g_road_vector) as g_road_vector,speed,speed_start_date,speed_end_date,line,is_start,create_date,update_date from bsth_c_road_speed where is_start=0", BeanPropertyRowMapper.newInstance(RoadSpeed.class));
+//            if(roadSpeedList.size() > 0)
+//                LD_SectionBufferData.putRoadSpeeds(roadSpeedList);
             //查询最新版本路段信息
             List<LD_SectionRoute> sectionRoutes = jdbcTemplate.query("select b.line_name,a.line_code,a.section_code,a.directions,a.sectionroute_code,a.versions from (select l.name line_name,l.line_code line_code,max(versions) versions from bsth_c_line l left join bsth_c_line_versions v on l.line_code = v.line_code where l.destroy = 0 group by l.name,l.line_code) b left join  bsth_c_ls_sectionroute a on a.line_code = b.line_code and a.versions = b.versions where a.destroy = 0 order by a.line_code,a.directions,a.sectionroute_code", BeanPropertyRowMapper.newInstance(LD_SectionRoute.class));
+package com.bsth.server_rs.dks;
+
+import com.bsth.common.SystemParamKeys;
+import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+import com.bsth.server_rs.base_info.carpark.Carpark;
+import com.bsth.server_rs.base_info.carpark.buffer.CarparkBufferData;
+import com.bsth.server_rs.base_info.line.Line;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.base_info.section.buffer.LD_SectionBufferData;
+import com.bsth.server_rs.base_info.section.entity.LD_Section;
+import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
+import com.bsth.server_rs.base_info.station.buffer.StationBufferData;
+import com.bsth.server_rs.base_info.station.entity.StationRotue;
+import com.bsth.server_rs.gps.buffer.BasicDataBuffer;
+import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
+import com.bsth.server_rs.gps.entity.GpsEntity;
+import com.bsth.server_rs.gps.entity.LineInfo;
+import com.bsth.service.SystemParamService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Hill
+ * @date 2021-09
+ */
+@Component
+@Path("/external")
+@Produces({MediaType.APPLICATION_JSON})
+public class BxRestService {
+
+    private final static Logger log = LoggerFactory.getLogger(BxRestService.class);
+
+    @Autowired
+    private SystemParamService systemParamService;
+
+    @Autowired
+    private LD_SectionBufferData ldSectionBufferData;
+
+    @GET
+    @Path("/line")
+    public List<Map<String, Object>> findAllLine() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        String limitLines = systemParamService.getValue(SystemParamKeys.LIMIT_LINES);
+        if (limitLines == null) {
+            return result;
+        }
+        for (Line line : LineBufferData.findAll()) {
+            String lineCode = line.getLineCode();
+            if (limitLines.indexOf(String.format("%s,", lineCode)) > -1) {
+                Map<String, Object> lineMap = new HashMap<>();
+                Collection<LD_SectionRoute> sectionRoutes = ldSectionBufferData.findByLineCode(lineCode).get(String.format("%s_0", lineCode));
+                StringBuilder sb = new StringBuilder();
+                for (LD_SectionRoute sectionRoute : sectionRoutes) {
+                    sb.append(sectionRoute.getSection().getGsectionVector().replace("LINESTRING(", "").replace(")", "")).append(",");
+                }
+                sb.deleteCharAt(sb.length() - 1);
+                lineMap.put("company", BasicDataBuffer.getBusinessByCode(line.getCompany()));
+                lineMap.put("branch", BasicDataBuffer.getBusinessByCode(String.format("%s_%s", line.getCompany(), line.getBrancheCompany())));
+                lineMap.put("lineName", line.getName());
+                lineMap.put("lineCode", line.getShanghaiLinecode());
+                lineMap.put("startStation", line.getStartStationName());
+                lineMap.put("endStation", line.getEndStationName());
+                lineMap.put("lineLength", line.getTotalMileage());
+                lineMap.put("upSEtime", String.format("%s-%s", line.getStartStationFirstTime(), line.getStartStationEndTime()));
+                lineMap.put("upLinelonlat", sb.toString());
+                lineMap.put("downSEtime", String.format("%s-%s", line.getEndStationFirstTime(), line.getEndStationEndTime()));
+                lineMap.put("downLinelonlat", null);
+
+                result.add(lineMap);
+            }
+        }
+
+        return result;
+    }
+
+    @GET
+    @Path("/station")
+    public List<Map<String, Object>> findAllStation() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        String limitLines = systemParamService.getValue(SystemParamKeys.LIMIT_LINES);
+        if (limitLines == null) {
+            return result;
+        }
+        for (String lineCode : limitLines.split(",")) {
+            if (!"".equals(lineCode)) {
+                Map<String, Object> lineMap = new HashMap<>();
+                Line line = LineBufferData.findOne(lineCode);
+                lineMap.put("lineName", line.getName());
+                lineMap.put("lineCode", line.getShanghaiLinecode());
+
+                int count = 1;
+                List<Map<String, Object>> upStations = new ArrayList<>(), downStations = new ArrayList<>();
+                for (StationRotue route : StationBufferData.findRouteByLineCode(lineCode).get(String.format("%s_0", lineCode))) {
+                    Map<String, Object> stopMap = new HashMap<>();
+                    stopMap.put("levelNo", count);
+                    stopMap.put("levelName", route.getStationName());
+                    stopMap.put("levelLonlat", String.format("%f %f", route.getStation().getLon(), route.getStation().getLat()));
+                    stopMap.put("stationCode", null);
+                    upStations.add(stopMap);
+                    count++;
+                }
+                count = 1;
+                for (StationRotue route : StationBufferData.findRouteByLineCode(lineCode).get(String.format("%s_1", lineCode))) {
+                    Map<String, Object> stopMap = new HashMap<>();
+                    stopMap.put("levelNo", count);
+                    stopMap.put("levelName", route.getStationName());
+                    stopMap.put("levelLonlat", String.format("%f %f", route.getStation().getLon(), route.getStation().getLat()));
+                    stopMap.put("stationCode", null);
+                    downStations.add(stopMap);
+                    count++;
+                }
+
+                lineMap.put("upStations", upStations);
+                lineMap.put("downStations", downStations);
+                result.add(lineMap);
+            }
+        }
+
+        return result;
+    }
+
+    @GET
+    @Path("/vehicle")
+    public List<Map<String, Object>> findAllVehicle() {
+        StringBuilder sb = new StringBuilder();
+        Map<String, String> device2line = GpsRealDataBuffer.getDevice2Line();
+        String limitLines = systemParamService.getValue(SystemParamKeys.LIMIT_LINES);
+        for (Map.Entry<String, String> entry : device2line.entrySet()) {
+            String deviceId = entry.getKey(), lineCode = entry.getValue();
+            if (limitLines.indexOf(String.format("%s,", lineCode)) > -1) {
+                sb.append(deviceId).append(",");
+            }
+        }
+        String limitDevices = sb.toString();
+        List<Map<String, Object>> result = new ArrayList<>();
+        if (limitDevices.equals("")) {
+            return result;
+        }
+        for (Car car : CarBufferData.findAll()) {
+            if (limitDevices.indexOf(String.format("%s,", car.getEquipmentCode())) > -1) {
+                Map<String, Object> carMap = new HashMap<>();
+                Line line = LineBufferData.findOne(device2line.get(car.getEquipmentCode()));
+                if (line == null) {
+                    continue;
+                }
+                carMap.put("lineName", line.getName());
+                carMap.put("lineCode", line.getShanghaiLinecode());
+                carMap.put("vehicleId", car.getCarPlate());
+                carMap.put("vehicleNo", car.getNbbm());
+                carMap.put("vehicleType", car.getVehicleType());
+                carMap.put("energyType", car.getSfdc() ? 3 : 0);
+
+                result.add(carMap);
+            }
+        }
+
+        return result;
+    }
+
+    @GET
+    @Path("/parking")
+    public List<Map<String, Object>> findAllParking() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        String limitLines = systemParamService.getValue(SystemParamKeys.LIMIT_LINES);
+        if (limitLines == null) {
+            return result;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Line line : LineBufferData.findAll()) {
+            String lineCode = line.getLineCode();
+            if (limitLines.indexOf(String.format("%s,", lineCode)) > -1) {
+                sb.append(line.getCarPark()).append(",");
+            }
+        }
+        String limitParkings = sb.toString();
+
+        if (limitParkings.equals("")) {
+            return result;
+        }
+        for (Carpark carpark : CarparkBufferData.findAll()) {
+            if (limitParkings.indexOf(String.format("%s,", carpark.getParkCode())) > -1) {
+                Map<String, Object> parkMap = new HashMap<>();
+                parkMap.put("company", BasicDataBuffer.getBusinessByCode(carpark.getCompany()));
+                parkMap.put("parkName", carpark.getParkName());
+                parkMap.put("parkAddress", null);
+                parkMap.put("parkLonlat", carpark.getgParkPoint());
+                result.add(parkMap);
+            }
+        }
+
+        return result;
+    }
+
+    @GET
+    @Path("/gps/all")
+    public List<Map<String, Object>> findAllGps() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        String limitLines = systemParamService.getValue(SystemParamKeys.LIMIT_LINES);
+        if (limitLines == null) {
+            return result;
+        }
+        for (GpsEntity gps : GpsRealDataBuffer.all()) {
+            String lineCode = gps.getLineId(), deviceId = gps.getDeviceId();
+            if (limitLines.indexOf(String.format("%s,", lineCode)) > -1) {
+                Line line = LineBufferData.findOne(lineCode);
+                Car car = CarBufferData.findOne(deviceId);
+                Map<String, Object> gpsMap = new HashMap<>();
+                gpsMap.put("lineName", line.getName());
+                gpsMap.put("lineCode", line.getShanghaiLinecode());
+                gpsMap.put("vehicleId", car.getCarPlate());
+                gpsMap.put("gpsTime", gps.getTimestamp());
+                gpsMap.put("gpsLonlat", String.format("%f %f", gps.getLon(), gps.getLat()));
+                gpsMap.put("angle", gps.getDirection());
+
+                result.add(gpsMap);
+            }
+        }
+
+        return result;
+    }
+}
-package com.bsth.server_rs.exception;
-
-/**
- * Created by panzhao on 2017/3/28.
- */
-public class AesException extends RuntimeException {
-
-    public final static int OK = 0;
-    public final static int MISS_SIGN = -30001;
-    public final static int MISS_TIMESTAMP = -30002;
-    public final static int MISS_NONCE = -30003;
-    public final static int NO_RANDOM_NONCE = -30005;
-    public final static int MISS_PWD = -30004;
-    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;
-
-    private static String getMessage(int code) {
-        switch (code) {
-            case MISS_SIGN:
-                return "sign参数丢失";
-            case MISS_TIMESTAMP:
-                return "timestamp参数丢失";
-            case MISS_NONCE:
-                return "nonce参数丢失";
-            case NO_RANDOM_NONCE:
-                return "nonce参数异常";
-            case MISS_PWD:
-                return "密码参数丢失";
-            case INVALID_PWD:
-                return "无效的密码";
-            case SIGN_CHECK_ERROR:
-                return "签名校验时出现异常";
-            case SIGN_CHECK_FAIL:
-                return "无效的签名";
-            case INVALID_TIMESTAMP:
-                return "无效的时间戳";
-            default:
-                return null;
-        }
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public AesException(int code) {
-        super(getMessage(code));
-        this.code = code;
-    }
-}
+package com.bsth.server_rs.exception;
+
+/**
+ * Created by panzhao on 2017/3/28.
+ */
+public class AesException extends RuntimeException {
+
+    public final static int OK = 0;
+    public final static int MISS_SIGN = -30001;
+    public final static int MISS_TIMESTAMP = -30002;
+    public final static int MISS_NONCE = -30003;
+    public final static int NO_RANDOM_NONCE = -30005;
+    public final static int MISS_PWD = -30004;
+    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;
+    public final static int INVALID_URI = -40005;
+
+    private int code;
+
+    private static String getMessage(int code) {
+        switch (code) {
+            case MISS_SIGN:
+                return "sign参数丢失";
+            case MISS_TIMESTAMP:
+                return "timestamp参数丢失";
+            case MISS_NONCE:
+                return "nonce参数丢失";
+            case NO_RANDOM_NONCE:
+                return "nonce参数异常";
+            case MISS_PWD:
+                return "密码参数丢失";
+            case INVALID_PWD:
+                return "无效的密码";
+            case SIGN_CHECK_ERROR:
+                return "签名校验时出现异常";
+            case SIGN_CHECK_FAIL:
+                return "无效的签名";
+            case INVALID_TIMESTAMP:
+                return "无效的时间戳";
+            case INVALID_URI:
+                return "无效的URI";
+            default:
+                return null;
+        }
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public AesException(int code) {
+        super(getMessage(code));
+        this.code = code;
+    }
+}
-package com.bsth.server_rs.gps.buffer;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.stereotype.Component;
-
-import com.bsth.server_rs.gps.entity.LineInfo;
-
-/**
- * Created by panzhao on 2017/3/30.
- */
-@Component
-public class BasicDataBuffer {
-
-	private static Map<Integer, LineInfo> LINEID_INFO = new HashMap<Integer, LineInfo>();
-	
-	private static Map<String, String> DEVICE_PLATE = new HashMap<String, String>();
-	
-	public static void putLine(Integer lineId, LineInfo info) {
-		LINEID_INFO.put(lineId, info);
-	}
-	
-	public static void putCar(String deviceId, String plateNo) {
-		DEVICE_PLATE.put(deviceId, plateNo);
-	}
-	
-	public static String getPlateByDevice(String deviceId) {
-		return DEVICE_PLATE.get(deviceId);
-	}
-	
-	public static Set<Integer> getAllLine() {
-		return LINEID_INFO.keySet();
-	}
-	
-	public static LineInfo getLineById(Integer lineId) {
-		return LINEID_INFO.get(lineId);
-	}
-}
+package com.bsth.server_rs.gps.buffer;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.stereotype.Component;
+
+import com.bsth.server_rs.gps.entity.LineInfo;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class BasicDataBuffer {
+
+	private static Map<Integer, LineInfo> LINEID_INFO = new HashMap<Integer, LineInfo>();
+	
+	private static Map<String, String> DEVICE_PLATE = new HashMap<String, String>();
+
+	private static Map<String, String> BCODE_NAME = new HashMap<>();
+	
+	public static void putLine(Integer lineId, LineInfo info) {
+		LINEID_INFO.put(lineId, info);
+	}
+	
+	public static void putCar(String deviceId, String plateNo) {
+		DEVICE_PLATE.put(deviceId, plateNo);
+	}
+	
+	public static String getPlateByDevice(String deviceId) {
+		return DEVICE_PLATE.get(deviceId);
+	}
+	
+	public static Set<Integer> getAllLine() {
+		return LINEID_INFO.keySet();
+	}
+	
+	public static LineInfo getLineById(Integer lineId) {
+		return LINEID_INFO.get(lineId);
+	}
+
+	public static void putBusiness(String code, String name) {
+		BCODE_NAME.put(code, name);
+	}
+
+	public static String getBusinessByCode(String code) {
+		return BCODE_NAME.get(code);
+	}
+}
-package com.bsth.server_rs.gps.buffer;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Component;
-
-import com.bsth.server_rs.gps.entity.LineInfo;
-import com.bsth.server_rs.gps.entity.Point;
-import com.bsth.server_rs.gps.entity.StopInfo;
-
-/**
- * Created by panzhao on 2017/3/30.
- */
-@Component
-public class BasicDataRefreshThread extends Thread implements InitializingBean {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-    
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public void run() {
-        loadBasicData();
-    }
-    
-    private void loadBasicData() {
-    	try {
-        	String qline = "select a.id,in_use,line_code,name,start_station_name,start_station_first_time,start_station_end_time,end_station_name,end_station_first_time,end_station_end_time,company,branche_company,length,telephone,speed_limit,shanghai_linecode,line_play_type,up_travel_time,down_travel_time from bsth_c_line a left join bsth_c_line_information b on a.id = b.line where a.destroy = 0 and a.nature = 'hlwgj'";
-        	String qstop = "select b.id,b.station_cod,b.station_name,b.road_coding,b.g_lonx,b.g_laty,b.shapes_type,b.radius,AsText(b.g_polygon_grid) as g_polygon_grid,a.line,a.line_code,a.directions,a.distances from bsth_c_stationroute a join bsth_c_station b on a.station = b.id where a.destroy = 0 order by a.line,a.directions,a.station_route_code";
-        	String qcar = "select equipment_code device_id, car_plate plate_no from bsth_c_cars";
-        	
-        	List<LineInfo> lines = jdbcTemplate.query(qline, new RowMapperLineInfo());
-        	List<StopInfo> stops = jdbcTemplate.query(qstop, new RowMapperStopInfo());
-        	List<Map<String, Object>> cars = jdbcTemplate.queryForList(qcar);
-        	
-        	// 缓存线路基本信息
-    		for (LineInfo line : lines) {
-    			BasicDataBuffer.putLine(line.getLineId(), line);
-    		}
-    		
-    		// 线路信息中添加上下行站点信息
-    		int oldId = -1;
-    		LineInfo line = null;
-    		for (StopInfo stop : stops) {
-    			if (stop.getLineCode() != oldId) {
-    				oldId = stop.getLineCode();
-    				line = BasicDataBuffer.getLineById(oldId);
-    			}
-    			if (line != null) {
-    				if (stop.getDirections() == 0) line.getStopsUp().add(stop);
-    				else line.getStopsDown().add(stop);
-    			}
-    		}
-    		
-    		for (Map<String, Object> car : cars) {
-    			BasicDataBuffer.putCar((String)car.get("device_id"), (String)car.get("plate_no"));
-    		}
-    		
-    		logger.info("基础数据加载成功");
-        }catch (Exception e){
-            logger.error("基础数据加载失败", e);
-        }
-    }
-    
-    final class RowMapperLineInfo implements RowMapper<LineInfo> {
-
-		@Override
-		public LineInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-			// TODO Auto-generated method stub
-			LineInfo line = new LineInfo();
-			line.setId(rs.getInt("id"));
-			line.setInUse(rs.getInt("in_use"));
-			line.setLineId(rs.getInt("line_code"));
-			line.setLineName(rs.getString("name"));
-			//line.setStartStation(rs.getInt("start_station"));
-			line.setStartStationName(rs.getString("start_station_name"));
-			line.setStartStationFirstTime(rs.getString("start_station_first_time"));
-			line.setStartStationEndTime(rs.getString("start_station_end_time"));
-			//line.setEndStation(rs.getInt("end_station"));
-			line.setEndStationName(rs.getString("end_station_name"));
-			line.setEndStationFirstTime(rs.getString("end_station_first_time"));
-			line.setEndStationEndTime(rs.getString("end_station_end_time"));
-			line.setCompany(rs.getString("company"));
-			line.setBrancheCompany(rs.getString("branche_company"));
-			line.setTelephone(rs.getString("telephone"));
-			line.setLinePlayType(rs.getInt("line_play_type"));
-			return line;
-		}
-		
-	}
-    
-    final class RowMapperStopInfo implements RowMapper<StopInfo> {
-
-		@Override
-		public StopInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-			// TODO Auto-generated method stub
-			StopInfo stop = new StopInfo();
-			stop.setId(rs.getInt("id"));
-			stop.setStationCod(rs.getString("station_cod"));
-			stop.setStationName(rs.getString("station_name"));
-			//stop.setStationType(rs.getString("station_type"));
-			stop.setRoadCoding(rs.getString("road_coding"));
-			float lon = rs.getFloat("g_lonx");
-			float lat = rs.getFloat("g_laty");
-			stop.setPoint(new Point(lon, lat));
-			stop.setLineId(rs.getInt("line"));
-			stop.setLineCode(rs.getInt("line_code"));
-			stop.setDirections(rs.getInt("directions"));
-			stop.setShapesType(rs.getString("shapes_type"));
-			stop.setRadius(rs.getInt("radius"));
-			stop.setPoints(new ArrayList<Point>());
-			stop.setDistances(rs.getDouble("distances")*1000);
-			return stop;
-		}
-		
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		// TODO Auto-generated method stub
-		loadBasicData();
-	}
-}
+package com.bsth.server_rs.gps.buffer;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+import com.bsth.server_rs.gps.entity.LineInfo;
+import com.bsth.server_rs.gps.entity.Point;
+import com.bsth.server_rs.gps.entity.StopInfo;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class BasicDataRefreshThread extends Thread implements InitializingBean {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public void run() {
+        loadBasicData();
+    }
+    
+    private void loadBasicData() {
+    	try {
+        	String qline = "select a.id,in_use,line_code,name,start_station_name,start_station_first_time,start_station_end_time,end_station_name,end_station_first_time,end_station_end_time,company,branche_company,length,telephone,speed_limit,shanghai_linecode,line_play_type,up_travel_time,down_travel_time from bsth_c_line a left join bsth_c_line_information b on a.id = b.line where a.destroy = 0 and a.nature = 'hlwgj'";
+        	String qstop = "select b.id,b.station_cod,b.station_name,b.road_coding,b.g_lonx,b.g_laty,b.shapes_type,b.radius,AsText(b.g_polygon_grid) as g_polygon_grid,a.line,a.line_code,a.directions,a.distances from bsth_c_stationroute a join bsth_c_station b on a.station = b.id where a.destroy = 0 order by a.line,a.directions,a.station_route_code";
+        	String qcar = "select equipment_code device_id, car_plate plate_no from bsth_c_cars";
+			String qbusiness = "select business_code, up_code, business_name from bsth_c_business where up_code <> 0";
+        	
+        	List<LineInfo> lines = jdbcTemplate.query(qline, new RowMapperLineInfo());
+        	List<StopInfo> stops = jdbcTemplate.query(qstop, new RowMapperStopInfo());
+        	List<Map<String, Object>> cars = jdbcTemplate.queryForList(qcar);
+			List<Map<String, Object>> businesses = jdbcTemplate.queryForList(qbusiness);
+        	
+        	// 缓存线路基本信息
+    		for (LineInfo line : lines) {
+    			BasicDataBuffer.putLine(line.getLineId(), line);
+    		}
+    		
+    		// 线路信息中添加上下行站点信息
+    		int oldId = -1;
+    		LineInfo line = null;
+    		for (StopInfo stop : stops) {
+    			if (stop.getLineCode() != oldId) {
+    				oldId = stop.getLineCode();
+    				line = BasicDataBuffer.getLineById(oldId);
+    			}
+    			if (line != null) {
+    				if (stop.getDirections() == 0) line.getStopsUp().add(stop);
+    				else line.getStopsDown().add(stop);
+    			}
+    		}
+    		
+    		for (Map<String, Object> car : cars) {
+    			BasicDataBuffer.putCar((String)car.get("device_id"), (String)car.get("plate_no"));
+    		}
+
+			for (Map<String, Object> business : businesses) {
+				String businessCode = (String)business.get("business_code"), upCode = (String)business.get("up_code"), businessName = (String)business.get("business_name");
+				if ("88".equals(upCode)) {
+					BasicDataBuffer.putBusiness(businessCode, businessName);
+				} else {
+					BasicDataBuffer.putBusiness(String.format("%s_%s", upCode, businessCode), businessName);
+				}
+			}
+    		
+    		logger.info("基础数据加载成功");
+        }catch (Exception e){
+            logger.error("基础数据加载失败", e);
+        }
+    }
+    
+    final class RowMapperLineInfo implements RowMapper<LineInfo> {
+
+		@Override
+		public LineInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+			// TODO Auto-generated method stub
+			LineInfo line = new LineInfo();
+			line.setId(rs.getInt("id"));
+			line.setInUse(rs.getInt("in_use"));
+			line.setLineId(rs.getInt("line_code"));
+			line.setLineName(rs.getString("name"));
+			//line.setStartStation(rs.getInt("start_station"));
+			line.setStartStationName(rs.getString("start_station_name"));
+			line.setStartStationFirstTime(rs.getString("start_station_first_time"));
+			line.setStartStationEndTime(rs.getString("start_station_end_time"));
+			//line.setEndStation(rs.getInt("end_station"));
+			line.setEndStationName(rs.getString("end_station_name"));
+			line.setEndStationFirstTime(rs.getString("end_station_first_time"));
+			line.setEndStationEndTime(rs.getString("end_station_end_time"));
+			line.setCompany(rs.getString("company"));
+			line.setBrancheCompany(rs.getString("branche_company"));
+			line.setTelephone(rs.getString("telephone"));
+			line.setLinePlayType(rs.getInt("line_play_type"));
+			return line;
+		}
+		
+	}
+    
+    final class RowMapperStopInfo implements RowMapper<StopInfo> {
+
+		@Override
+		public StopInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+			// TODO Auto-generated method stub
+			StopInfo stop = new StopInfo();
+			stop.setId(rs.getInt("id"));
+			stop.setStationCod(rs.getString("station_cod"));
+			stop.setStationName(rs.getString("station_name"));
+			//stop.setStationType(rs.getString("station_type"));
+			stop.setRoadCoding(rs.getString("road_coding"));
+			float lon = rs.getFloat("g_lonx");
+			float lat = rs.getFloat("g_laty");
+			stop.setPoint(new Point(lon, lat));
+			stop.setLineId(rs.getInt("line"));
+			stop.setLineCode(rs.getInt("line_code"));
+			stop.setDirections(rs.getInt("directions"));
+			stop.setShapesType(rs.getString("shapes_type"));
+			stop.setRadius(rs.getInt("radius"));
+			stop.setPoints(new ArrayList<Point>());
+			stop.setDistances(rs.getDouble("distances")*1000);
+			return stop;
+		}
+		
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		// TODO Auto-generated method stub
+		loadBasicData();
+	}
+}
-package com.bsth.server_rs.gps.buffer;
-
-import com.bsth.server_rs.gps.entity.GpsEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/3/30.
- */
-@Component
-public class GpsRealDataBuffer {
-
-    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();
-    }
-}
+package com.bsth.server_rs.gps.buffer;
+
+import com.bsth.server_rs.gps.entity.GpsEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class GpsRealDataBuffer {
+
+    private static Map<String, GpsEntity> realMap = new HashMap<>();
+
+    private static Map<String, String> device2line =  new HashMap<>();
+
+    @Autowired
+    GpsRefreshThread gpsRefreshThread;
+
+    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();
+    }
+
+    public static void putLineCode(String device, String lineCode){
+        device2line.put(device, lineCode);
+    }
+
+    public static String getLineCodeByDevice(String device){
+        return device2line.get(device);
+    }
+
+    public static Map<String, String> getDevice2Line(){
+        return device2line;
+    }
+}
-package com.bsth.server_rs.gps.buffer;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.server_rs.gps.entity.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);
-        }
-    }
-}
+package com.bsth.server_rs.gps.buffer;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.server_rs.gps.entity.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);
+                GpsRealDataBuffer.putLineCode(gps.getDeviceId(), gps.getLineId());
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
 package com.bsth.server_rs.man_hours;
-import com.bsth.entity.WhiteIp;
-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 org.springframework.web.bind.annotation.PathVariable;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -13,7 +8,6 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 /**
-package com.bsth.server_rs.schedule.dto;
-
-import com.bsth.entity.ChildTaskPlan;
-import com.bsth.entity.ScheduleRealInfo;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * 输出给监控平台的实际排班
- * Created by panzhao on 2017/8/30.
- */
-@XmlRootElement
-public class ScheduleRealInfoDTO_JK implements Serializable {
-
-    public static List<ScheduleRealInfoDTO_JK> getMultiInstance(List<ScheduleRealInfo> list) {
-
-        List<ScheduleRealInfoDTO_JK> rs = new ArrayList<>();
-
-        if(list == null || list.size()==0)
-            return rs;
-        Collections.sort(list, new Comparator<ScheduleRealInfo>() {
-            @Override
-            public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
-                return o1.getFcsj().compareTo(o2.getFcsj());
-            }
-        });
-
-        for (ScheduleRealInfo sch : list) {
-            rs.add(new ScheduleRealInfoDTO_JK(sch));
-        }
-        return rs;
-    }
-
-    ScheduleRealInfoDTO_JK() {
-    }
-
-    ScheduleRealInfoDTO_JK(ScheduleRealInfo sch) {
-        this.id = sch.getId();
-        this.scheduleDate = sch.getScheduleDateStr();
-        this.lineName = sch.getXlName();
-        this.lineCode = sch.getXlBm();
-        this.lpName = sch.getLpName();
-        this.nbbm = sch.getClZbh();
-        this.jsy = sch.getjGh() + "/" + sch.getjName();
-        this.spy = sch.getsGh() + "/" + sch.getsName();
-        this.upDown = Integer.parseInt(sch.getXlDir());
-        this.qdzCode = sch.getQdzCode();
-        this.qdzName = sch.getQdzName();
-        this.zdzCode = sch.getZdzCode();
-        this.zdzName = sch.getZdzName();
-        this.fcsjT = sch.getFcsjT();
-        this.dfsjT = sch.getDfsjT();
-        this.zdsjT = sch.getZdsjT();
-        this.fcsjActualTime = sch.getFcsjActualTime();
-        this.zdsjActualTime = sch.getZdsjActualTime();
-        this.jhlc = sch.getJhlc();
-        this.jhlcOrig = sch.getJhlcOrig();
-        this.bcsj = sch.getBcsj();
-        this.bcType = sch.getBcType();
-        this.status = sch.getStatus();
-        this.adjustExps = sch.getAdjustExps();
-        this.sflj = sch.isSflj();
-        this.remarks = sch.getRemarks();
-        this.cTasks = sch.getcTasks();
-    }
-
-    private Long id;
-
-    private String scheduleDate;
-
-    /**
-     * 线路名称
-     */
-    private String lineName;
-    /**
-     * 线路编码
-     */
-    private String lineCode;
-
-    /**
-     * 路牌名称
-     */
-    private String lpName;
-
-    /**
-     * 车辆自编号
-     */
-    private String nbbm;
-
-    /**
-     * 驾驶员工号/名称
-     */
-    private String jsy;
-    /**
-     * 售票员工号/名称
-     */
-    private String spy;
-
-    /**
-     * 线路方向
-     */
-    private Integer upDown;
-    /**
-     * 起点站code
-     */
-    private String qdzCode;
-    /**
-     * 起点站名字
-     */
-    private String qdzName;
-
-    /**
-     * 终点站code
-     */
-    private String zdzCode;
-    /**
-     * 终点站名字
-     */
-    private String zdzName;
-
-    /**
-     * 计划发车时间戳
-     */
-    private Long fcsjT;
-    /**
-     * 待发时间戳
-     */
-    private Long dfsjT;
-    /**
-     * 计划终点时间戳
-     */
-    private Long zdsjT;
-
-    /**
-     * 实际发车时间戳
-     */
-    private Long fcsjActualTime;
-    /**
-     * 实际终点时间戳
-     */
-    private Long zdsjActualTime;
-
-    /**
-     * 实际计划里程
-     */
-    private Double jhlc;
-
-    /**
-     * 计划里程
-     */
-    private Double jhlcOrig;
-
-    /**
-     * 班次历时
-     */
-    private Integer bcsj;
-
-    /**
-     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
-     */
-    private String bcType;
-
-
-    /**
-     * 班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班
-     */
-    private int status;
-
-    private String adjustExps;
-
-    /**
-     * 是否是临加班次
-     */
-    private boolean sflj;
-
-    /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
-     * 子任务
-     */
-    private Set<ChildTaskPlan> cTasks;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getScheduleDate() {
-        return scheduleDate;
-    }
-
-    public void setScheduleDate(String scheduleDate) {
-        this.scheduleDate = scheduleDate;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getLpName() {
-        return lpName;
-    }
-
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public String getJsy() {
-        return jsy;
-    }
-
-    public void setJsy(String jsy) {
-        this.jsy = jsy;
-    }
-
-    public String getSpy() {
-        return spy;
-    }
-
-    public void setSpy(String spy) {
-        this.spy = spy;
-    }
-
-    public String getQdzCode() {
-        return qdzCode;
-    }
-
-    public void setQdzCode(String qdzCode) {
-        this.qdzCode = qdzCode;
-    }
-
-    public String getQdzName() {
-        return qdzName;
-    }
-
-    public void setQdzName(String qdzName) {
-        this.qdzName = qdzName;
-    }
-
-    public String getZdzCode() {
-        return zdzCode;
-    }
-
-    public void setZdzCode(String zdzCode) {
-        this.zdzCode = zdzCode;
-    }
-
-    public String getZdzName() {
-        return zdzName;
-    }
-
-    public void setZdzName(String zdzName) {
-        this.zdzName = zdzName;
-    }
-
-    public Long getFcsjT() {
-        return fcsjT;
-    }
-
-    public void setFcsjT(Long fcsjT) {
-        this.fcsjT = fcsjT;
-    }
-
-    public Long getDfsjT() {
-        return dfsjT;
-    }
-
-    public void setDfsjT(Long dfsjT) {
-        this.dfsjT = dfsjT;
-    }
-
-    public Long getZdsjT() {
-        return zdsjT;
-    }
-
-    public void setZdsjT(Long zdsjT) {
-        this.zdsjT = zdsjT;
-    }
-
-    public Long getFcsjActualTime() {
-        return fcsjActualTime;
-    }
-
-    public void setFcsjActualTime(Long fcsjActualTime) {
-        this.fcsjActualTime = fcsjActualTime;
-    }
-
-    public Long getZdsjActualTime() {
-        return zdsjActualTime;
-    }
-
-    public void setZdsjActualTime(Long zdsjActualTime) {
-        this.zdsjActualTime = zdsjActualTime;
-    }
-
-    public Double getJhlc() {
-        return jhlc;
-    }
-
-    public void setJhlc(Double jhlc) {
-        this.jhlc = jhlc;
-    }
-
-    public Double getJhlcOrig() {
-        return jhlcOrig;
-    }
-
-    public void setJhlcOrig(Double jhlcOrig) {
-        this.jhlcOrig = jhlcOrig;
-    }
-
-    public Integer getBcsj() {
-        return bcsj;
-    }
-
-    public void setBcsj(Integer bcsj) {
-        this.bcsj = bcsj;
-    }
-
-    public String getBcType() {
-        return bcType;
-    }
-
-    public void setBcType(String bcType) {
-        this.bcType = bcType;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getAdjustExps() {
-        return adjustExps;
-    }
-
-    public void setAdjustExps(String adjustExps) {
-        this.adjustExps = adjustExps;
-    }
-
-    public boolean isSflj() {
-        return sflj;
-    }
-
-    public void setSflj(boolean sflj) {
-        this.sflj = sflj;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public Set<ChildTaskPlan> getcTasks() {
-        return cTasks;
-    }
-
-    public void setcTasks(Set<ChildTaskPlan> cTasks) {
-        this.cTasks = cTasks;
-    }
-
-    public Integer getUpDown() {
-        return upDown;
-    }
-
-    public void setUpDown(Integer upDown) {
-        this.upDown = upDown;
-    }
-}
+package com.bsth.server_rs.schedule.dto;
+
+import com.bsth.entity.ChildTaskPlan;
+import com.bsth.entity.ScheduleRealInfo;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * 输出给监控平台的实际排班
+ * Created by panzhao on 2017/8/30.
+ */
+@XmlRootElement
+public class ScheduleRealInfoDTO_JK implements Serializable {
+
+    public static List<ScheduleRealInfoDTO_JK> getMultiInstance(List<ScheduleRealInfo> list) {
+
+        List<ScheduleRealInfoDTO_JK> rs = new ArrayList<>();
+
+        if(list == null || list.size()==0)
+            return rs;
+        Collections.sort(list, new Comparator<ScheduleRealInfo>() {
+            @Override
+            public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+                return o1.getFcsj().compareTo(o2.getFcsj());
+            }
+        });
+
+        for (ScheduleRealInfo sch : list) {
+            rs.add(new ScheduleRealInfoDTO_JK(sch));
+        }
+        return rs;
+    }
+
+    ScheduleRealInfoDTO_JK() {
+    }
+
+    ScheduleRealInfoDTO_JK(ScheduleRealInfo sch) {
+        this.id = sch.getId();
+        this.scheduleDate = sch.getScheduleDateStr();
+        this.lineName = sch.getXlName();
+        this.lineCode = sch.getXlBm();
+        this.lpName = sch.getLpName();
+        this.nbbm = sch.getClZbh();
+        this.jsy = sch.getjGh() + "/" + sch.getjName();
+        this.spy = sch.getsGh() + "/" + sch.getsName();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.qdzCode = sch.getQdzCode();
+        this.qdzName = sch.getQdzName();
+        this.zdzCode = sch.getZdzCode();
+        this.zdzName = sch.getZdzName();
+        this.fcsjT = sch.getFcsjT();
+        this.dfsjT = sch.getDfsjT();
+        this.zdsjT = sch.getZdsjT();
+        this.fcsjActualTime = sch.getFcsjActualTime();
+        this.zdsjActualTime = sch.getZdsjActualTime();
+        this.jhlc = sch.getJhlc();
+        this.jhlcOrig = sch.getJhlcOrig();
+        this.bcsj = sch.getBcsj();
+        this.bcType = sch.getBcType();
+        this.status = sch.getStatus();
+        this.adjustExps = sch.getAdjustExps();
+        this.sflj = sch.isSflj();
+        this.remarks = sch.getRemarks();
+        this.cTasks = sch.getcTasks();
+        this.updateDate = sch.getUpdateDate().getTime();
+    }
+
+    private Long id;
+
+    private String scheduleDate;
+
+    /**
+     * 线路名称
+     */
+    private String lineName;
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 路牌名称
+     */
+    private String lpName;
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 驾驶员工号/名称
+     */
+    private String jsy;
+    /**
+     * 售票员工号/名称
+     */
+    private String spy;
+
+    /**
+     * 线路方向
+     */
+    private Integer upDown;
+    /**
+     * 起点站code
+     */
+    private String qdzCode;
+    /**
+     * 起点站名字
+     */
+    private String qdzName;
+
+    /**
+     * 终点站code
+     */
+    private String zdzCode;
+    /**
+     * 终点站名字
+     */
+    private String zdzName;
+
+    /**
+     * 计划发车时间戳
+     */
+    private Long fcsjT;
+    /**
+     * 待发时间戳
+     */
+    private Long dfsjT;
+    /**
+     * 计划终点时间戳
+     */
+    private Long zdsjT;
+
+    /**
+     * 实际发车时间戳
+     */
+    private Long fcsjActualTime;
+    /**
+     * 实际终点时间戳
+     */
+    private Long zdsjActualTime;
+
+    /**
+     * 实际计划里程
+     */
+    private Double jhlc;
+
+    /**
+     * 计划里程
+     */
+    private Double jhlcOrig;
+
+    /**
+     * 班次历时
+     */
+    private Integer bcsj;
+
+    /**
+     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+     */
+    private String bcType;
+
+
+    /**
+     * 班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班
+     */
+    private int status;
+
+    private String adjustExps;
+
+    /**
+     * 是否是临加班次
+     */
+    private boolean sflj;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    private Double oilConsum;
+    private Double elecConsum;
+    private Double h2Consum;
+    private Long updateDate;
+
+    /**
+     * 子任务
+     */
+    private Set<ChildTaskPlan> cTasks;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(String scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
+
+    public String getSpy() {
+        return spy;
+    }
+
+    public void setSpy(String spy) {
+        this.spy = spy;
+    }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public Long getFcsjT() {
+        return fcsjT;
+    }
+
+    public void setFcsjT(Long fcsjT) {
+        this.fcsjT = fcsjT;
+    }
+
+    public Long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(Long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public Long getZdsjT() {
+        return zdsjT;
+    }
+
+    public void setZdsjT(Long zdsjT) {
+        this.zdsjT = zdsjT;
+    }
+
+    public Long getFcsjActualTime() {
+        return fcsjActualTime;
+    }
+
+    public void setFcsjActualTime(Long fcsjActualTime) {
+        this.fcsjActualTime = fcsjActualTime;
+    }
+
+    public Long getZdsjActualTime() {
+        return zdsjActualTime;
+    }
+
+    public void setZdsjActualTime(Long zdsjActualTime) {
+        this.zdsjActualTime = zdsjActualTime;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Double getJhlcOrig() {
+        return jhlcOrig;
+    }
+
+    public void setJhlcOrig(Double jhlcOrig) {
+        this.jhlcOrig = jhlcOrig;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getAdjustExps() {
+        return adjustExps;
+    }
+
+    public void setAdjustExps(String adjustExps) {
+        this.adjustExps = adjustExps;
+    }
+
+    public boolean isSflj() {
+        return sflj;
+    }
+
+    public void setSflj(boolean sflj) {
+        this.sflj = sflj;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Set<ChildTaskPlan> getcTasks() {
+        return cTasks;
+    }
+
+    public void setcTasks(Set<ChildTaskPlan> cTasks) {
+        this.cTasks = cTasks;
+    }
+
+    public Integer getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(Integer upDown) {
+        this.upDown = upDown;
+    }
+
+    public Double getOilConsum() {
+        return oilConsum;
+    }
+
+    public void setOilConsum(Double oilConsum) {
+        this.oilConsum = oilConsum;
+    }
+
+    public Double getElecConsum() {
+        return elecConsum;
+    }
+
+    public void setElecConsum(Double elecConsum) {
+        this.elecConsum = elecConsum;
+    }
+
+    public Double getH2Consum() {
+        return h2Consum;
+    }
+
+    public void setH2Consum(Double h2Consum) {
+        this.h2Consum = h2Consum;
+    }
+
+    public Long getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Long updateDate) {
+        this.updateDate = updateDate;
+    }
+}
-package com.bsth.server_rs.schedule.real;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.entity.ScheduleRealInfo;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 实际排班缓存
- * Created by panzhao on 2017/9/27.
- */
-@Component
-public class SchRealDataBuffer {
-
-    /**
-     * 进出场班次数据，定时从调度系统获取。 对各场站输出
-     */
-    private static ArrayListMultimap<String, ScheduleRealInfo> inOutMap;
-
-    /**
-     * 车辆 和 当前正在执行班次对照
-     */
-    private static Map<String, JSONObject> execMap;
-
-    public void putInOutData(List<ScheduleRealInfo> list) {
-        ArrayListMultimap<String, ScheduleRealInfo> inOutMapCopy = ArrayListMultimap.create();
-
-        String type;
-        for (ScheduleRealInfo sch : list) {
-            type = sch.getBcType();
-            if (StringUtils.isEmpty(type))
-                continue;
-
-            if (type.equals("in"))
-                inOutMapCopy.put(sch.getZdzCode(), sch);
-            else if (type.equals("out"))
-                inOutMapCopy.put(sch.getQdzCode(), sch);
-        }
-
-        inOutMap = inOutMapCopy;
-    }
-
-
-    public void setExecMap(Map<String, JSONObject> map) {
-        if (map.size() > 0)
-            execMap = map;
-    }
-
-    public List<ScheduleRealInfo> findByParkCode(String parkCode) {
-        return inOutMap.get(parkCode);
-    }
-
- /*   public List<JSONObject> findExec(List<String> cars){
-        List<JSONObject> rs = new ArrayList<>(cars.size());
-
-        for(String nbbm : cars){
-            rs.add(execMap.get(nbbm));
-        }
-        return rs;
-    }*/
-
-    public JSONObject getExecPlan(String nbbm) {
-        return execMap.get(nbbm);
-    }
-
-    public Collection<JSONObject> execs() {
-        return execMap.values();
-    }
-}
+package com.bsth.server_rs.schedule.real;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 实际排班缓存
+ * Created by panzhao on 2017/9/27.
+ */
+@Component
+public class SchRealDataBuffer {
+
+    /**
+     * 进出场班次数据，定时从调度系统获取。 对各场站输出
+     */
+    private static ArrayListMultimap<String, ScheduleRealInfo> inOutMap;
+
+    /**
+     * 车辆 和 当前正在执行班次对照
+     */
+    private static Map<String, JSONObject> execMap;
+
+    public void putInOutData(List<ScheduleRealInfo> list) {
+        ArrayListMultimap<String, ScheduleRealInfo> inOutMapCopy = ArrayListMultimap.create();
+
+        String type;
+        for (ScheduleRealInfo sch : list) {
+            type = sch.getBcType();
+            if (StringUtils.isEmpty(type))
+                continue;
+
+            if (type.equals("in"))
+                inOutMapCopy.put(sch.getZdzCode(), sch);
+            else if (type.equals("out"))
+                inOutMapCopy.put(sch.getQdzCode(), sch);
+        }
+
+        inOutMap = inOutMapCopy;
+    }
+
+    public Collection<ScheduleRealInfo> getInOutData() {
+        return inOutMap.values();
+    }
+
+    public void setExecMap(Map<String, JSONObject> map) {
+        if (map.size() > 0)
+            execMap = map;
+    }
+
+    public List<ScheduleRealInfo> findByParkCode(String parkCode) {
+        return inOutMap.get(parkCode);
+    }
+
+ /*   public List<JSONObject> findExec(List<String> cars){
+        List<JSONObject> rs = new ArrayList<>(cars.size());
+
+        for(String nbbm : cars){
+            rs.add(execMap.get(nbbm));
+        }
+        return rs;
+    }*/
+
+    public JSONObject getExecPlan(String nbbm) {
+        return execMap.get(nbbm);
+    }
+
+    public Collection<JSONObject> execs() {
+        return execMap.values();
+    }
+}
@@ -14,6 +14,8 @@ import com.bsth.server_rs.base_info.car.Car;
 import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
 import com.bsth.server_rs.base_info.line.Line;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
+import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
+import com.bsth.server_rs.gps.entity.GpsEntity;
 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
 import com.bsth.server_rs.schedule.dto.ScheduleInOut;
 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
@@ -326,11 +328,36 @@ public class ScheduleRealService implements InitializingBean {
     @GET
     @Path("/insideCodes/{rq}")
     public List<String> insideCodes(@PathParam("rq") String rq) {
-        List<String> codes = jdbcTemplate.queryForList("select DISTINCT cl_zbh from bsth_c_s_sp_info_real t where t.schedule_date_str = ? and status = 2", new Object[]{ rq }, String.class);
+        List<String> codes = jdbcTemplate.queryForList("select DISTINCT cl_zbh from bsth_c_s_sp_info_real t where t.schedule_date_str = ? and status = 2", new Object[]{rq}, String.class);
         return codes;
     }
+    /**
+     * 获取不在岗的班次信息
+     */
+    @GET
+    @Path("/notOnDuty")
+    public List<ScheduleRealInfo> notOnDuty() {
+        List<ScheduleRealInfo> result = new ArrayList<>();
+        Collection<ScheduleRealInfo> collection = schRealDataBuffer.getInOutData();
+        long now = System.currentTimeMillis();
+        for (ScheduleRealInfo sch : collection) {
+            if ("in".equals(sch.getBcType())) {
+                continue;
+            }
+            GpsEntity gpsEntity = GpsRealDataBuffer.get(CarBufferData.findOne(sch.getClZbh()).getEquipmentCode());
+            long schIntervalMillis = sch.getDfsjT() - now, gpsIntervalMillis =  sch.getDfsjT() - (gpsEntity == null ? 0 : gpsEntity.getTimestamp());
+            boolean isSchMatch = schIntervalMillis > 0 && schIntervalMillis < 1200000, isGpsMatch = gpsIntervalMillis > 1200000;
+            // 当前时间往后20分钟内的出场班次 且相应车辆在待发时间20分钟内无GPS数据
+            if (isSchMatch && isGpsMatch) {
+                result.add(sch);
+            }
+        }
+
+        return result;
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         Application.mainServices.scheduleWithFixedDelay(new Runnable() {
+package com.bsth.service;
+
+public interface SystemParamService {
+
+    void refresh();
+
+    String getValue(String key);
+}
+package com.bsth.service.impl;
+
+import com.bsth.entity.SystemParam;
+import com.bsth.repository.SystemParamRepository;
+import com.bsth.service.SystemParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@EnableScheduling
+public class SystemParamServiceImpl implements SystemParamService {
+
+    @Autowired
+    private SystemParamRepository systemParamRepository;
+
+    private Map<String, String> pairs = new HashMap<>();
+
+    @Scheduled(cron = "0 0/30 * * * ?")
+    public void refresh() {
+        for (SystemParam sp : systemParamRepository.findAll()) {
+            pairs.put(sp.getKey(), sp.getValue());
+        }
+    }
+
+    public String getValue(String key) {
+        return pairs.get(key);
+    }
+}