Commit 24dc0a50a32e5a891602d7b87484015788a82b99
1 parent
8ae7718d
1.运能运力一盘棋+绕改道
Showing
1 changed file
with
12 additions
and
1 deletions
src/main/java/com/bsth/data/BasicData.java
| @@ -110,6 +110,8 @@ public class BasicData { | @@ -110,6 +110,8 @@ public class BasicData { | ||
| 110 | 110 | ||
| 111 | public static Map<String, StationRoute> stationCode2StationMap; | 111 | public static Map<String, StationRoute> stationCode2StationMap; |
| 112 | 112 | ||
| 113 | + private static List<String> serviceNbbmsList = new ArrayList<>(); | ||
| 114 | + | ||
| 113 | static Logger logger = LoggerFactory.getLogger(BasicData.class); | 115 | static Logger logger = LoggerFactory.getLogger(BasicData.class); |
| 114 | 116 | ||
| 115 | public static String getStationNameByCode(String code, String prefix){ | 117 | public static String getStationNameByCode(String code, String prefix){ |
| @@ -117,6 +119,10 @@ public class BasicData { | @@ -117,6 +119,10 @@ public class BasicData { | ||
| 117 | return name != null? name: stationCode2NameMap.get(prefix + code); | 119 | return name != null? name: stationCode2NameMap.get(prefix + code); |
| 118 | } | 120 | } |
| 119 | 121 | ||
| 122 | + public static List<String> getServiceNbbms() { | ||
| 123 | + return serviceNbbmsList; | ||
| 124 | + } | ||
| 125 | + | ||
| 120 | /* @Autowired | 126 | /* @Autowired |
| 121 | JdbcTemplate jdbcTemplate; | 127 | JdbcTemplate jdbcTemplate; |
| 122 | public Map<String, String> getNbbm2PlateNo(){ | 128 | public Map<String, String> getNbbm2PlateNo(){ |
| @@ -242,7 +248,8 @@ public class BasicData { | @@ -242,7 +248,8 @@ public class BasicData { | ||
| 242 | BiMap<String, String> nbbmCompanyPlate = HashBiMap.create(); | 248 | BiMap<String, String> nbbmCompanyPlate = HashBiMap.create(); |
| 243 | 249 | ||
| 244 | BiMap<String, String> plateNbbm = HashBiMap.create(); | 250 | BiMap<String, String> plateNbbm = HashBiMap.create(); |
| 245 | - | 251 | + List<String> serviceNbbms = new ArrayList<>(); |
| 252 | + | ||
| 246 | Iterator<Cars> carIterator = carsRepository.findAll().iterator(); | 253 | Iterator<Cars> carIterator = carsRepository.findAll().iterator(); |
| 247 | Cars car; | 254 | Cars car; |
| 248 | while (carIterator.hasNext()) { | 255 | while (carIterator.hasNext()) { |
| @@ -252,6 +259,9 @@ public class BasicData { | @@ -252,6 +259,9 @@ public class BasicData { | ||
| 252 | nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBrancheCompanyCode() + "_" + car.getBusinessCode() ); | 259 | nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBrancheCompanyCode() + "_" + car.getBusinessCode() ); |
| 253 | nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate()); | 260 | nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate()); |
| 254 | plateNbbm.put(car.getCarPlate(),car.getInsideCode()); | 261 | plateNbbm.put(car.getCarPlate(),car.getInsideCode()); |
| 262 | + if (car.getScrapState() == null || !car.getScrapState()) { | ||
| 263 | + serviceNbbms.add(car.getInsideCode()); | ||
| 264 | + } | ||
| 255 | } | 265 | } |
| 256 | 266 | ||
| 257 | deviceId2NbbmMap = deviceId2Nbbm; | 267 | deviceId2NbbmMap = deviceId2Nbbm; |
| @@ -259,6 +269,7 @@ public class BasicData { | @@ -259,6 +269,7 @@ public class BasicData { | ||
| 259 | nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode; | 269 | nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode; |
| 260 | nbbmCompanyPlateMap =nbbmCompanyPlate; | 270 | nbbmCompanyPlateMap =nbbmCompanyPlate; |
| 261 | plate2NbbmMap=plateNbbm; | 271 | plate2NbbmMap=plateNbbm; |
| 272 | + serviceNbbmsList = serviceNbbms; | ||
| 262 | } | 273 | } |
| 263 | 274 | ||
| 264 | /** | 275 | /** |