update...

潘钊
1 parent ab5fd6f0
Showing 4 changed files with 98 additions and 2 deletions
src/main/java/com/bsth/server_rs/base_info/section/LD_SectionRestService.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/base_info/section/entity/RoadSpeed.java
@@ -2,6 +2,8 @@ package com.bsth.server_rs.base_info.section;
  
 import com.bsth.server_rs.base_info.section.buffer.LD_SectionBufferData;
 import com.bsth.server_rs.base_info.section.entity.LD_SectionRoute;
+import com.bsth.server_rs.base_info.section.entity.RoadSpeed;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
 import javax.ws.rs.GET;
@@ -10,6 +12,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
  
 /**
@@ -21,9 +24,18 @@ import java.util.Map;
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
 public class LD_SectionRestService {
  
+    @Autowired
+    LD_SectionBufferData sectionBufferData;
+
     @GET
     @Path("/{company}")
     public Map<String, Collection<LD_SectionRoute>> findByCompany(@PathParam("company") String company){
-        return LD_SectionBufferData.findRouteByCompany(company);
+        return sectionBufferData.findRouteByCompany(company);
+    }
+
+    @GET
+    @Path("/road_speed_config/{company}")
+    public List<RoadSpeed> roadSpeedList(@PathParam("company") String company){
+        return sectionBufferData.roadSpeedList(company);
     }
 }
@@ -5,10 +5,14 @@ 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.*;
@@ -26,9 +30,17 @@ public class LD_SectionBufferData implements CommandLineRunner {
     private static List<LD_Section> data;
     private static Map<String, LD_Section> codeMap;
  
+    //路段限速缓存信息
+    private static List<RoadSpeed> roadSpeedList;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
     @Autowired
     LD_SectionRefreshThread ld_sectionRefreshThread;
  
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
     /**
         路由缓存
         线路编码_上下行 ——> 路由集合
@@ -58,6 +70,10 @@ public class LD_SectionBufferData implements CommandLineRunner {
         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
@@ -79,7 +95,7 @@ public class LD_SectionBufferData implements CommandLineRunner {
         Application.mainServices.scheduleWithFixedDelay(ld_sectionRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
     }
  
-    public static Map<String, Collection<LD_SectionRoute>> findRouteByCompany(String company) {
+    public Map<String, Collection<LD_SectionRoute>> findRouteByCompany(String company) {
         List<Line> lines = LineBufferData.findByCompany(company);
  
         ArrayListMultimap<String, LD_SectionRoute> listMap = ArrayListMultimap.create();
@@ -103,4 +119,8 @@ public class LD_SectionBufferData implements CommandLineRunner {
         }
         return false;
     }
+
+    public List<RoadSpeed> roadSpeedList(String company) {
+        return roadSpeedList;
+    }
 }
@@ -2,6 +2,7 @@ package com.bsth.server_rs.base_info.section.buffer;
  
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +46,11 @@ public class LD_SectionRefreshThread extends Thread{
             }
  
             LD_SectionBufferData.replaceRoutes(routeList);
+
+            //查询路段限速信息
+            List<RoadSpeed> roadSpeedList = jdbcTemplate.query("select * from bsth_c_road_speed where is_start=0", BeanPropertyRowMapper.newInstance(RoadSpeed.class));
+            if(roadSpeedList.size() > 0)
+                LD_SectionBufferData.putRoadSpeeds(roadSpeedList);
         }catch (Exception e){
             logger.error("", e);
         }
+package com.bsth.server_rs.base_info.section.entity;
+
+/**
+ * 路段限速
+ * Created by panzhao on 2017/11/12.
+ */
+public class RoadSpeed {
+
+    private String name;
+
+    private String gsectionVector;
+
+    private Double speed;
+
+    private String st;
+
+    private String et;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGsectionVector() {
+        return gsectionVector;
+    }
+
+    public void setGsectionVector(String gsectionVector) {
+        this.gsectionVector = gsectionVector;
+    }
+
+    public Double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    public String getSt() {
+        return st;
+    }
+
+    public void setSt(String st) {
+        this.st = st;
+    }
+
+    public String getEt() {
+        return et;
+    }
+
+    public void setEt(String et) {
+        this.et = et;
+    }
+}