1.zyl接口加入电量信息

王通
1 parent 2dd32eb3
Showing 8 changed files with 44 additions and 23 deletions
src/main/java/com/bsth/server_rs/directive/DirectiveRestService.java
src/main/java/com/bsth/server_rs/gps/buffer/BasicDataBuffer.java
src/main/java/com/bsth/server_rs/gps/buffer/BasicDataRefreshThread.java
src/main/java/com/bsth/server_rs/gps/buffer/GpsRefreshThread.java
src/main/java/com/bsth/server_rs/gps/entity/GpsEntity.java
src/main/java/com/bsth/server_rs/schedule/SchedulePlanService.java
src/main/java/com/bsth/server_rs/schedule/ScheduleRealService.java
src/main/resources/application-prod.properties
@@ -71,13 +71,14 @@ public class DirectiveRestService implements InitializingBean {
                 return result;
             }
-            if (plate.contains("-")) {
+            if (!plate.contains("-")) {
                 plate = BasicDataBuffer.getIncodeByIncode(plate);
             }
+            String incode = plate;
             plate = BasicDataBuffer.getPlateByIncode(plate);
             map.put("plate", plate);
             ZylInfo zylInfo = new ZylInfo(lineId, trainNum);
-            plate2zyl.put(plate, zylInfo);
+            plate2zyl.put(incode, zylInfo);
             map.put("sender", "中运量接口@系统");
             StringBuilder sb = HttpClientUtils.post(url, JSON.toJSONString(map));
         }catch (Exception e){
@@ -23,15 +23,19 @@ public class BasicDataBuffer {
 	private static Map<String, String> INCODE_PLATE = new HashMap<String, String>();
 	private static Map<String, String> INCODE_INCODE = new HashMap<>();
+
+	private static Map<String, String> INCODE_VIN = new HashMap<>();
 	public static void putLine(Integer lineId, LineInfo info) {
 		LINEID_INFO.put(lineId, info);
 	}
-	public static void putCar(String deviceId, String plateNo, String insideCode) {
+	public static void putCar(String deviceId, String plateNo, String insideCode, String vin) {
 		DEVICE_PLATE.put(deviceId, plateNo);
 		DEVICE_INCODE.put(deviceId, insideCode);
 		INCODE_PLATE.put(insideCode, plateNo);
+		INCODE_VIN.put(insideCode, vin);
+
 		if (insideCode != null) {
 			INCODE_INCODE.put(insideCode.replaceAll("-", ""), insideCode);
 		}
@@ -52,6 +56,10 @@ public class BasicDataBuffer {
 	public static String getPlateByIncode(String insideCode) {
 		return INCODE_PLATE.get(insideCode);
 	}
+
+	public static String getVinByIncode(String insideCode) {
+		return INCODE_VIN.get(insideCode);
+	}
 	public static Set<Integer> getAllLine() {
 		return LINEID_INFO.keySet();
@@ -38,7 +38,7 @@ public class BasicDataRefreshThread extends Thread implements InitializingBean {
     	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, inside_code from bsth_c_cars";
+        	String qcar = "select equipment_code device_id, car_plate plate_no, inside_code, vin from bsth_c_cars";
         	List<LineInfo> lines = jdbcTemplate.query(qline, new RowMapperLineInfo());
         	List<StopInfo> stops = jdbcTemplate.query(qstop, new RowMapperStopInfo());
@@ -64,7 +64,7 @@ public class BasicDataRefreshThread extends Thread implements InitializingBean {
     		}
     		for (Map<String, Object> car : cars) {
-    			BasicDataBuffer.putCar((String)car.get("device_id"), (String)car.get("plate_no"), (String)car.get("inside_code"));
+    			BasicDataBuffer.putCar((String) car.get("device_id"), (String) car.get("plate_no"), (String) car.get("inside_code"), (String) car.get("vin"));
     		}
     		logger.info("基础数据加载成功");
@@ -2,6 +2,7 @@ package com.bsth.server_rs.gps.buffer;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.VehicleData;
 import com.bsth.entity.ZylInfo;
 import com.bsth.server_rs.directive.DirectiveRestService;
 import com.bsth.server_rs.gps.entity.GpsEntity;
@@ -67,9 +68,13 @@ public class GpsRefreshThread extends Thread{
                 rs = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
             for (GpsEntity gps : rs) {
-                String incode = BasicDataBuffer.getIncodeByDevice(gps.getDeviceId());
+                String incode = BasicDataBuffer.getIncodeByDevice(gps.getDeviceId()), vin = BasicDataBuffer.getVinByIncode(incode);
                 if (incode != null) {
                     gps.setPlate(incode);
+                    VehicleData vehicleData = VehicleRealDataBuffer.getVehicleData(vin);
+                    if (vehicleData != null) {
+                        gps.setEnergy(vehicleData.getSoc());
+                    }
                     //gps.setPlate(incode.replace("-", ""));
                 }
                 if (gps.getPlate() == null) {
@@ -81,6 +81,8 @@ public class GpsEntity implements Serializable{
 	private int zylTrainNum;
+	private int energy;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -272,4 +274,12 @@ public class GpsEntity implements Serializable{
 	public void setZylTrainNum(int zylTrainNum) {
 		this.zylTrainNum = zylTrainNum;
 	}
+
+	public int getEnergy() {
+		return energy;
+	}
+
+	public void setEnergy(int energy) {
+		this.energy = energy;
+	}
 }
@@ -17,7 +17,6 @@ import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,10 +34,8 @@ public class SchedulePlanService {
     private JdbcTemplate jdbcTemplate;
     @POST
-    public Map<String, Object> save(ScheduleRealInfo real) throws JsonProcessingException {
+    public Map<String, Object> save(final List<ScheduleRealInfo> reals) throws JsonProcessingException {
         Map<String, Object> result = new HashMap<>();
-        final List<ScheduleRealInfo> reals = new ArrayList<>();
-        reals.add(real);
         log.error(mapper.writeValueAsString(reals));
         jdbcTemplate.batchUpdate("insert into zyl.bsth_c_s_sp_real_info (schedule_date_str,xl_name,lp_name,cl_zbh,jsy,spy," +
                 "direction,qdz_name,zdz_name,fcsj,fcno,jhlc,bcsj,bc_type) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
@@ -19,7 +19,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,12 +37,10 @@ public class ScheduleRealService {
     @POST
     @Path("/leave")
-    public Map<String, Object> leave(ScheduleExec exec) throws JsonProcessingException {
+    public Map<String, Object> leave(final List<ScheduleExec> execs) throws JsonProcessingException {
         Map<String, Object> result = new HashMap<>();
-        final List<ScheduleExec> execs = new ArrayList<>();
-        execs.add(exec);
         log.error(mapper.writeValueAsString(execs));
-        jdbcTemplate.batchUpdate("update zyl.bsth_c_s_sp_real_info set fcsj_actual = ? where xl_name = ? and cl_zbh = ? and lp_name = ? and fcsj = ?", new BatchPreparedStatementSetter() {
+        jdbcTemplate.batchUpdate("update zyl.bsth_c_s_sp_info_real set fcsj_actual = ? where xl_name = ? and cl_zbh = ? and lp_name = ? and fcsj = ?", new BatchPreparedStatementSetter() {
             @Override
             public void setValues(PreparedStatement ps, int i) throws SQLException {
                 ScheduleExec scheduleExec = execs.get(i);
@@ -67,12 +64,10 @@ public class ScheduleRealService {
     @POST
     @Path("/arrival")
-    public Map<String, Object> arrival(ScheduleExec exec) throws JsonProcessingException {
+    public Map<String, Object> arrival(final List<ScheduleExec> execs) throws JsonProcessingException {
         Map<String, Object> result = new HashMap<>();
-        final List<ScheduleExec> execs = new ArrayList<>();
-        execs.add(exec);
         log.error(mapper.writeValueAsString(execs));
-        jdbcTemplate.batchUpdate("update zyl.bsth_c_s_sp_real_info set zdsj_actual = ? where xl_name = ? and cl_zbh = ? and lp_name = ? and fcsj = ?", new BatchPreparedStatementSetter() {
+        jdbcTemplate.batchUpdate("update zyl.bsth_c_s_sp_info_real set zdsj_actual = ? where xl_name = ? and cl_zbh = ? and lp_name = ? and fcsj = ?", new BatchPreparedStatementSetter() {
             @Override
             public void setValues(PreparedStatement ps, int i) throws SQLException {
                 ScheduleExec scheduleExec = execs.get(i);
@@ -96,12 +91,10 @@ public class ScheduleRealService {
     @POST
     @Path("/destroy")
-    public Map<String, Object> destroy(ScheduleExec exec) throws JsonProcessingException {
+    public Map<String, Object> destroy(final List<ScheduleExec> execs) throws JsonProcessingException {
         Map<String, Object> result = new HashMap<>();
-        final List<ScheduleExec> execs = new ArrayList<>();
-        execs.add(exec);
         log.error(mapper.writeValueAsString(execs));
-        jdbcTemplate.batchUpdate("update zyl.bsth_c_s_sp_real_info set status = -1 where xl_name = ? and cl_zbh = ? and lp_name = ? and fcsj = ?", new BatchPreparedStatementSetter() {
+        jdbcTemplate.batchUpdate("update zyl.bsth_c_s_sp_info_real set status = -1 where xl_name = ? and cl_zbh = ? and lp_name = ? and fcsj = ?", new BatchPreparedStatementSetter() {
             @Override
             public void setValues(PreparedStatement ps, int i) throws SQLException {
                 ScheduleExec scheduleExec = execs.get(i);
@@ -23,6 +23,13 @@ spring.datasource.test-on-return=true
 spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
+#kafka
+spring.kafka.bootstrap-servers= 10.10.200.203:9092
+spring.kafka.consumer.group-id= zyl_group
+spring.kafka.consumer.auto-offset-reset= latest
+spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+
 http.control.service_data_url= http://10.10.150.103:9088/companyService
 http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki