1.浦东公交提供经过闵行区的线路相关数据给闵行交通委

王通
1 parent 1ef94bff
Showing 2 changed files with 105 additions and 94 deletions
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarBufferData.java
src/main/java/com/bsth/server_rs/dks/BxRestService.java
-package com.bsth.server_rs.base_info.car.buffer;
-
-import com.bsth.Application;
-import com.bsth.server_rs.base_info.car.Car;
-import com.bsth.server_rs.base_info.dto.BusCardDto;
-import com.google.common.collect.ArrayListMultimap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 车辆数据缓存
- * Created by panzhao on 2017/3/30.
- */
-@Component
-@Order(6)
-public class CarBufferData implements CommandLineRunner {
-
-    private static List<Car> data;
-    private static Map<String, Car> idMap;
-    private static ArrayListMultimap<String, Car> companyListMap;
-
-    /**
-     * 待入库的bus car
-     */
-    public static LinkedList<Car> pstList = new LinkedList<>();
-
-    @Autowired
-    CarRefreshThread carRefreshThread;
-
-    public static List<Car> findAll(){
-        return data;
-    }
-
-    public static Car findOne(String nbbm){
-        return idMap.get(nbbm);
-    }
-
-    public static List<Car> findByCompany(String company){
-        return companyListMap.get(company);
-    }
-
-    public static void replaceAll(List<Car> newData){
-        data = newData;
-        Map<String, Car> idMapCopy = new HashMap<>();
-        ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
-
-        for(Car car : data){
-            idMapCopy.put(car.getNbbm(), car);
-            listMap.put(car.getCompanyCode(), car);
-        }
-        idMap = idMapCopy;
-
-        companyListMap = listMap;
-    }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(carRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
-    }
-
-    public static Map<String, Object> multiSaveCards(List<BusCardDto> list) {
-        int success=0,error=0;
-        //返回写入成功的卡数据
-        List<BusCardDto> rsList = new ArrayList<>();
-
-        Car c;
-        for(BusCardDto bcd : list){
-            c = idMap.get(bcd.getNbbm());
-            if(c == null)
-                error ++;
-            else{
-                c.setIdRfid(bcd.getIdCard());
-                c.setTagRfid(bcd.getTagCard());
-                c.setRemark(bcd.getRemark());
-                success ++;
-
-                pstList.add(c);
-                rsList.add(bcd);
-            }
-        }
-
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("success", success);
-        rs.put("successList", rsList);
-        rs.put("error", error);
-        return rs;
-    }
-}
+package com.bsth.server_rs.base_info.car.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.dto.BusCardDto;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 车辆数据缓存
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+@Order(6)
+public class CarBufferData implements CommandLineRunner {
+
+    private static List<Car> data;
+    private static Map<String, Car> idMap;
+    private static ArrayListMultimap<String, Car> companyListMap;
+    private static Map<String, Car> device2car = new HashMap<>();
+
+    /**
+     * 待入库的bus car
+     */
+    public static LinkedList<Car> pstList = new LinkedList<>();
+
+    @Autowired
+    CarRefreshThread carRefreshThread;
+
+    public static List<Car> findAll(){
+        return data;
+    }
+
+    public static Car findOne(String nbbm){
+        return idMap.get(nbbm);
+    }
+
+    public static List<Car> findByCompany(String company){
+        return companyListMap.get(company);
+    }
+
+    public static Car findByDevice(String device){
+        return device2car.get(device);
+    }
+
+    public static void replaceAll(List<Car> newData){
+        data = newData;
+        Map<String, Car> idMapCopy = new HashMap<>();
+        ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
+        Map<String, Car> device2carCopy = new HashMap<>();
+
+        for(Car car : data){
+            idMapCopy.put(car.getNbbm(), car);
+            listMap.put(car.getCompanyCode(), car);
+            device2carCopy.put(car.getEquipmentCode(), car);
+        }
+        idMap = idMapCopy;
+
+        companyListMap = listMap;
+        device2car = device2carCopy;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(carRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+
+    public static Map<String, Object> multiSaveCards(List<BusCardDto> list) {
+        int success=0,error=0;
+        //返回写入成功的卡数据
+        List<BusCardDto> rsList = new ArrayList<>();
+
+        Car c;
+        for(BusCardDto bcd : list){
+            c = idMap.get(bcd.getNbbm());
+            if(c == null)
+                error ++;
+            else{
+                c.setIdRfid(bcd.getIdCard());
+                c.setTagRfid(bcd.getTagCard());
+                c.setRemark(bcd.getRemark());
+                success ++;
+
+                pstList.add(c);
+                rsList.add(bcd);
+            }
+        }
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("success", success);
+        rs.put("successList", rsList);
+        rs.put("error", error);
+        return rs;
+    }
+}
@@ -213,7 +213,10 @@ public class BxRestService {
             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);
+                Car car = CarBufferData.findByDevice(deviceId);
+                if (car == null) {
+                    continue;
+                }
                 Map<String, Object> gpsMap = new HashMap<>();
                 gpsMap.put("lineName", line.getName());
                 gpsMap.put("lineCode", line.getShanghaiLinecode());