1.燃料电池数据对接

“fan1305”
1 parent 27f727e0
Showing 8 changed files with 556 additions and 6 deletions
src/main/java/com/bsth/entity/DeviceAbnormal.java
src/main/java/com/bsth/entity/ExtendData.java
src/main/java/com/bsth/entity/FuelCellData.java
src/main/java/com/bsth/entity/TerminalCollectData.java
src/main/java/com/bsth/entity/VehicleData.java
src/main/java/com/bsth/entity/VehicleLocationData.java
src/main/java/com/bsth/util/ProtocolConverter.java
src/main/resources/application-dev.properties
@@ -38,9 +38,7 @@ public class DeviceAbnormal {
 		return offline;
 	}
-	public void setOffline(int offline) {
-		this.offline = offline;
-	}
+	public void setOffline(int offline) { this.offline = offline; }
 	public int getDrift() {
 		return drift;
+package com.bsth.entity;
+import com.bsth.socket.protocol.Message0280;
+public class ExtendData extends Data{
+
+    /**
+     * 信息类型
+     * 默认应该为0x80
+     */
+    private byte infoType;
+
+    /**
+     * 自定义数据长度 1-65531
+     * 默认34
+     */
+    private short customDataLen;
+
+    /**
+     * 蓄电池电压 0-32
+     * 分辨率0.5v/bit
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte storageBatteryVoltage;
+
+    /**
+     * 左前轮胎压力 0-250
+     * 分辨率 4kPa
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte lfTirePressure;
+
+    /**
+     * 左前轮胎温度 0-250
+     * 分辨率 1℃
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte lfTireTemp;
+
+    /**
+     * 右前轮胎压力 0-250
+     * 分辨率 4kPa
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte rfTirePressure;
+
+    /**
+     * 右前轮胎温度 0-250
+     * 分辨率 1℃
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte rfTireTemp;
+
+    /**
+     * 左后轮胎1压力 0-250
+     * 分辨率 4kPa
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte lrTirePressure1;
+
+    /**
+     * 左后轮胎1温度 0-250
+     * 分辨率 1℃
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte lrTireTemp1;
+
+    /**
+     * 左后轮胎2压力 0-250
+     * 分辨率 4kPa
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte lrTirePressure2;
+
+    /**
+     * 左后轮胎2温度 0-250
+     * 分辨率 1℃
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte lrTireTemp2;
+
+    /**
+     * 右后轮胎1压力 0-250
+     * 分辨率 4kPa
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte rrTirePressure1;
+
+    /**
+     * 右后轮胎1温度 0-250
+     * 分辨率 1℃
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte rrTireTemp1;
+
+    /**
+     * 右后轮胎2压力 0-250
+     * 分辨率 4kPa
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte rrTirePressure2;
+
+    /**
+     * 右后轮胎2温度 0-250
+     * 分辨率 1℃
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte rrTireTemp2;
+
+    /**
+     * 无法定义
+     * 用了其中2，3位作为手刹状态
+     * 0无信号 1有信号 2异常 3无效
+     */
+
+
+    private byte unknown;
+
+
+    public ExtendData(Message0280 message0280){
+
+        this.infoType = message0280.getInfoType() != 0xFF ? message0280.getInfoType() : (byte) 0x80;
+
+        // 自定义数据长度，默认34
+        this.customDataLen = message0280.getCustomDataLen() != 0xFF ? message0280.getCustomDataLen() : (short) 34;
+
+        // 蓄电池电压
+        this.storageBatteryVoltage = message0280.getStorageBatteryVoltage();
+
+        // 左前轮胎压力
+        this.lfTirePressure = message0280.getLfTirePressure();
+
+        // 左前轮胎温度
+        this.lfTireTemp = message0280.getLfTireTemp();
+
+        // 右前轮胎压力
+        this.rfTirePressure = message0280.getRfTirePressure();
+
+        // 右前轮胎温度
+        this.rfTireTemp = message0280.getRfTireTemp();
+
+        // 左后轮胎1压力
+        this.lrTirePressure1 = message0280.getLrTirePressure1();
+
+        // 左后轮胎1温度
+        this.lrTireTemp1 = message0280.getLrTireTemp1();
+
+        // 左后轮胎2压力
+        this.lrTirePressure2 = message0280.getLrTirePressure2();
+
+        // 左后轮胎2温度
+        this.lrTireTemp2 = message0280.getLrTireTemp2();
+
+        // 右后轮胎1压力
+        this.rrTirePressure1 = message0280.getRrTirePressure1();
+
+        // 右后轮胎1温度
+        this.rrTireTemp1 = message0280.getRrTireTemp1();
+
+        // 右后轮胎2压力
+        this.rrTirePressure2 = message0280.getRrTirePressure2();
+
+        // 右后轮胎2温度
+        this.rrTireTemp2 = message0280.getRrTireTemp2();
+
+
+
+
+
+    }
+
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(" 信息类型: ").append(String.format("%02x", infoType))
+                .append(" 自定义数据长度: ").append(customDataLen)
+                .append(" 蓄电池电压: ").append(storageBatteryVoltage)
+                .append(" 左前轮压力: ").append(lfTirePressure)
+                .append(" 左前轮温度: ").append(lfTireTemp)
+                .append(" 右前轮压力: ").append(rfTirePressure)
+                .append(" 右前轮温度: ").append(rfTireTemp)
+                .append(" 左后轮1压力: ").append(lrTirePressure1)
+                .append(" 左后轮1温度: ").append(lrTireTemp1)
+                .append(" 左后轮2压力: ").append(lrTirePressure2)
+                .append(" 左后轮2温度: ").append(lrTireTemp2)
+                .append(" 右后轮1压力: ").append(rrTirePressure1)
+                .append(" 右后轮1温度: ").append(rrTireTemp1)
+                .append(" 右后轮2压力: ").append(rrTirePressure2)
+                .append(" 右后轮2温度: ").append(rrTireTemp2)
+                .append(" 手刹状态: ").append(unknown);
+
+        return sb.toString();
+    }
+    @Override
+    public String getType() {
+
+        return "Extend_data";
+    }
+}
+package com.bsth.entity;
+import com.bsth.socket.protocol.Message0203;
+
+
+public class FuelCellData extends Data{
+
+    /**
+     * 信息类型
+     * 默认应该为0x03
+     */
+    private byte infoType;
+
+    /**
+     * 电池电压 0-20000
+     * 分辨率0.1v
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short voltage;
+
+    /**
+     * 电池电流 0-20000
+     * 分辨率0.1v
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short current;
+
+    /**
+     * 燃料消耗率 0-60000
+     * 分辨率0.01kg/100km
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short fuelConsumeRate;
+
+    /**
+     * 电池温度探针数量 0-65531
+     * n
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short tempProbeQuantity;
+
+    /**
+     * 累计里程 0-240
+     * 分辨率1℃ 偏移量-40 n*1
+     * 0xff 0xff 0xff 0xfe 异常
+     * 0xff 0xff 0xff 0xff 无效
+     */
+    private byte[] temps;
+
+    /**
+     * 氢系统中最高温度值 0-2400
+     * 分辨率0.1℃ 偏移量-400
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short hydrogenMaxTemp;
+
+    /**
+     * 氢系统最高温度探针代号 1-252
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte maxTempSensorCode;
+
+    /**
+     * 氢气最大浓度 0-60000
+     * 分辨率1mg/kg
+     * 0xFF 0xFE 异常
+     * 0xFF 0xFF 无效
+     */
+    private short hydrogenMaxConcentration;
+
+    /**
+     * 氢气最大浓度传感器代号 1-252
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte maxConcentrationSensorCode;
+
+    /**
+     * 氢气最高压力 0-1000
+     * 分辨率0.1MPa
+     * 0xFF 0xFE 异常
+     * 0xFF 0xFF 无效
+     */
+    private short hydrogenMaxPressure;
+
+    /**
+     * 氢气最大浓度传感器代号 1-252
+     * 0xfe 异常
+     * 0xff 无效
+     */
+    private byte maxPressureSensorCode;
+
+    /**
+     * dc-dc状态
+     * 0x01 工作
+     * 0x02 断开
+     * 0xFE 异常
+     * 0xFF 无效
+     */
+    private byte dcState;
+
+    public FuelCellData(Message0203 message0203){
+        this.infoType = message0203.getInfoType();
+        this.voltage = message0203.getVoltage();
+        this.current = message0203.getCurrent();
+        this.fuelConsumeRate = message0203.getFuelConsumeRate();
+        this.tempProbeQuantity = message0203.getTempProbeQuantity();
+        this.temps = message0203.getTemps();
+        this.hydrogenMaxTemp = message0203.getHydrogenMaxTemp();
+        this.maxTempSensorCode = message0203.getMaxTempSensorCode();
+        this.hydrogenMaxConcentration = message0203.getHydrogenMaxConcentration();
+        this.maxConcentrationSensorCode = message0203.getMaxConcentrationSensorCode();
+        this.hydrogenMaxPressure = message0203.getHydrogenMaxPressure();
+        this.maxPressureSensorCode = message0203.getMaxPressureSensorCode();
+        this.dcState = message0203.getDcState();
+    }
+
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(" 信息类型: ").append(String.format("%02x", infoType))
+                .append(" 电池电压: ").append(voltage)
+                .append(" 电池电流: ").append(current)
+                .append(" 燃料消耗率: ").append(fuelConsumeRate)
+                .append(" 电池温度探针数量: ").append(tempProbeQuantity)
+                .append(" 氢系统最高温度值: ").append(hydrogenMaxTemp)
+                .append(" 氢系统最高温度探针代号: ").append(maxTempSensorCode)
+                .append(" 氢气最大浓度: ").append(hydrogenMaxConcentration)
+                .append(" 氢气最大浓度传感器代号: ").append(maxConcentrationSensorCode)
+                .append(" 氢气最高压力: ").append(hydrogenMaxPressure)
+                .append(" 氢气最高压力传感器代号: ").append(maxPressureSensorCode)
+                .append(" dc-dc状态: ").append(dcState);
+
+        return sb.toString();
+    }
+
+
+
+
+    @Override
+    public String getType() {
+        return "FuelCell_data";
+    }
+}
+package com.bsth.entity;
+import com.bsth.socket.protocol.Message0281;
+
+public class TerminalCollectData extends Data {
+
+    private final static int BYTE_LEN = 10;
+
+    /**
+     * 加速踏板标识类型
+     * 默认应该为0x01
+     */
+    private byte acceleratorFlag;
+
+    /**
+     * 加速踏板行程值 0-100%
+     * 分辨率1%
+     * 0xFE 异常
+     * 0xFF 无效
+     */
+    private byte acceleratorState;
+
+    /**
+     * 制动踏板标识类型
+     * 默认应该为0x02
+     */
+    private byte brakePedalFlag;
+
+    /**
+     * 制动踏板状态 0-100%
+     * 分辨率1% 在无具体行程值情况下，用“101”表示制动有效状态
+     * 0xFE 异常
+     * 0xFF 无效
+     */
+    private byte brakePedalState;
+
+    /**
+     * 车速标识类型
+     * 默认应该为0x03
+     */
+    private byte speedFlag;
+
+    /**
+     * 车速 0-2200
+     * 分辨率0.1km/h
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short speed;
+
+    /**
+     * 总电流标识类型
+     * 默认应该为0x04
+     */
+    private byte totalCurrentFlag;
+
+    /**
+     * 总电流 0-20000
+     * 分辨率0.1a
+     * 0xff 0xfe 异常
+     * 0xff 0xff 无效
+     */
+    private short totalCurrent;
+
+    public TerminalCollectData(Message0281 message0281){
+
+        this.acceleratorFlag = message0281.getDataList().get(0).getAcceleratorFlag() != 0xFF ? message0281.getDataList().get(0).getAcceleratorFlag() : (byte) 0x01;
+
+        // 加速踏板行程值
+        this.acceleratorState = message0281.getDataList().get(0).getAcceleratorState();
+
+        // 制动踏板标识类型，默认应该为0x02
+        this.brakePedalFlag = message0281.getDataList().get(0).getBrakePedalFlag() != 0xFF ? message0281.getDataList().get(0).getBrakePedalFlag() : (byte) 0x02;
+
+        // 制动踏板状态
+        this.brakePedalState = message0281.getDataList().get(0).getBrakePedalState();
+
+
+        // 车速标识类型，默认应该为0x03
+        this.speedFlag = message0281.getDataList().get(0).getSpeedFlag() != 0xFF ? message0281.getDataList().get(0).getSpeedFlag() : (byte) 0x03;
+
+        // 车速
+        this.speed = message0281.getDataList().get(0).getSpeed();
+
+        // 总电流标识类型，默认应该为0x04
+        this.totalCurrentFlag = message0281.getDataList().get(0).getTotalCurrentFlag() != 0xFF ? message0281.getDataList().get(0).getTotalCurrentFlag() : (byte) 0x04;
+
+        // 总电流
+        this.totalCurrent = message0281.getDataList().get(0).getTotalCurrent();
+
+
+
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(" 加速踏板标识类型: ").append(acceleratorFlag)
+                .append(" 加速踏板行程值: ").append(acceleratorState)
+                .append(" 制动踏板标识类型: ").append(brakePedalFlag)
+                .append(" 制动踏板状态: ").append(brakePedalState)
+                .append(" 车速标识类型: ").append(speedFlag)
+                .append(" 车速: ").append(speed)
+                .append(" 总电流标识类型: ").append(totalCurrentFlag)
+                .append(" 总电流: ").append(totalCurrent)
+                .append("\n");
+
+        return sb.toString();
+    }
+
+    @Override
+    public String getType() {
+
+        return "TerminalCollect_data";
+    }
+}
@@ -142,7 +142,7 @@ public class VehicleData extends Data {
 	public VehicleData(Message0201 message0201) {
 		BeanUtils.copyProperties(message0201, this);
 		this.drivingForce = (gear & 32) == 32 ? true : false;
-		this.drivingForce = (gear & 16) == 16 ? true : false;
+		this.brakingForce = (gear & 16) == 16 ? true : false;
 		this.gear1 = (byte) (gear & 15);
 	}
+package com.bsth.entity;
+import com.bsth.socket.protocol.Message0205;
+
+public class VehicleLocationData extends Data {
+
+    /**
+     * 信息类型
+     * 默认应该为0x05
+     */
+    private byte infoType;
+
+    /**
+     * 定位状态
+     * 位0 0有效 1无效
+     * 位1 0北纬 1南纬
+     * 位2 0东经 1西经
+     * 位3-7 保留
+     */
+    private byte locationState;
+
+    /**
+     * 经度
+     * 分辨率0.000001
+     */
+    private int lon;
+
+    /**
+     * 纬度
+     * 分辨率0.000001
+     */
+    private int lat;
+
+
+    public VehicleLocationData(Message0205 message0205){
+
+
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(" 信息类型: ").append(String.format("%02x", infoType))
+                .append(" 定位状态: ").append(locationState)
+                .append(" 经度: ").append(lon)
+                .append(" 纬度: ").append(lat);
+
+        return sb.toString();
+    }
+
+
+
+    @Override
+    public String getType() {
+
+        return "VehicleLocation_data";
+    }
+
+}
@@ -4,6 +4,10 @@ import com.bsth.entity.AlarmData;
 import com.bsth.entity.Data;
 import com.bsth.entity.PeakData;
 import com.bsth.entity.VehicleData;
+import com.bsth.entity.ExtendData;
+import com.bsth.entity.FuelCellData;
+import com.bsth.entity.VehicleLocationData;
+import com.bsth.entity.TerminalCollectData;
 import com.bsth.socket.protocol.*;
 import java.util.HashMap;
@@ -48,6 +52,18 @@ public class ProtocolConverter {
         if (messageBody02 instanceof Message0207) {
             return new AlarmData((Message0207) messageBody02);
         }
+        if (messageBody02 instanceof Message0203){
+            return new FuelCellData((Message0203)messageBody02);
+        }
+        if (messageBody02 instanceof Message0205){
+            return new VehicleLocationData((Message0205)messageBody02);
+        }
+        if (messageBody02 instanceof Message0280){
+            return new ExtendData((Message0280)messageBody02);
+        }
+        if (messageBody02 instanceof Message0281){
+            return new TerminalCollectData((Message0281)messageBody02);
+        }
         return null;
     }
@@ -4,7 +4,7 @@ spring.jpa.show-sql= true
 spring.datasource.control.driver-class-name= com.mysql.cj.jdbc.Driver
 spring.datasource.control.jdbc-url= jdbc:mysql://10.10.150.103/control?useUnicode=true&characterEncoding=utf-8
 spring.datasource.control.username= root
-spring.datasource.control.password= Aa123456
+spring.datasource.control.password= fsodlgjiuigAQF2$9fs9
 #DATASOURCE
 spring.datasource.control.max-active=100
 spring.datasource.control.max-idle=8
@@ -20,7 +20,7 @@ spring.datasource.control.validation-query=select 1
 spring.datasource.ms.hikari.driver-class-name= com.mysql.cj.jdbc.Driver
 spring.datasource.ms.jdbc-url= jdbc:mysql://10.10.150.103/ms?useUnicode=true&characterEncoding=utf-8
 spring.datasource.ms.username= root
-spring.datasource.ms.password= Aa123456
+spring.datasource.ms.password= fsodlgjiuigAQF2$9fs9
 #DATASOURCE
 spring.datasource.ms.max-active=100
 spring.datasource.ms.max-idle=8