1.加入按线路名查询最新版本的路段信息

王通
1 parent 9be2dd8f
Showing 4 changed files with 51 additions and 0 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/LD_SectionRoute.java
@@ -11,6 +11,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;
  
 /**
@@ -37,4 +38,10 @@ public class LD_SectionRestService {
     public Map<String, Collection<LD_SectionRoute>> findByLineCode(@PathParam("lineCode") String lineCode){
         return sectionBufferData.findByLineCode(lineCode);
     }
+
+    @GET
+    @Path("/lineName/{lineName}")
+    public List<LD_SectionRoute> findByLineName(@PathParam("lineName") String lineName){
+        return sectionBufferData.findByLineName(lineName);
+    }
 }
@@ -16,6 +16,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
  
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
  
 /**
@@ -30,6 +31,11 @@ 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;
  
@@ -135,4 +141,12 @@ public class LD_SectionBufferData implements CommandLineRunner {
         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);
+    }
 }
@@ -10,7 +10,10 @@ 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/27.
@@ -51,6 +54,22 @@ public class LD_SectionRefreshThread extends Thread{
             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.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));
+            Map<String, List<LD_SectionRoute>> name2sections = new HashMap<>();
+            List<LD_SectionRoute> routes = null;
+            String lastedLineName = "";
+            for (LD_SectionRoute sr : sectionRoutes) {
+                if ("".equals(lastedLineName) || !lastedLineName.equals(sr.getLineName())) {
+                    name2sections.put(lastedLineName, routes);
+                    lastedLineName = sr.getLineName();
+                    routes = new ArrayList<>();
+                }
+                sr.setSection(LD_SectionBufferData.findOne(sr.getSectionCode()));
+                routes.add(sr);
+            }
+            LD_SectionBufferData.putLastedRoute(name2sections);
         }catch (Exception e){
             logger.error("", e);
         }
@@ -6,6 +6,9 @@ package com.bsth.server_rs.base_info.section.entity;
  */
 public class LD_SectionRoute {
  
+    /** 线路名称 */
+    private String lineName;
+
     /** 线路编号 */
     private String lineCode;
  
@@ -24,6 +27,14 @@ public class LD_SectionRoute {
     /** 路段详细 */
     private LD_Section section;
  
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
     public String getLineCode() {
         return lineCode;
     }