燃料电池数据对接

“fan1305”
1 parent 344f94b1
Showing 4 changed files with 47 additions and 29 deletions
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/VehicleLocationData.java
 package com.bsth.entity;
 import com.bsth.socket.protocol.Message0280;
+import org.springframework.beans.BeanUtils;
+
 public class ExtendData extends Data{
  
     /**
@@ -129,50 +131,57 @@ public class ExtendData extends Data{
  
  
     public ExtendData(Message0280 message0280){
+        BeanUtils.copyProperties(message0280, this);
  
-        this.infoType = message0280.getInfoType() != 0xFF ? message0280.getInfoType() : (byte) 0x80;
+        this.infoType &= (short) 0xFF;
  
         // 自定义数据长度，默认34
-        this.customDataLen = message0280.getCustomDataLen() != 0xFF ? message0280.getCustomDataLen() : (short) 34;
+        this.customDataLen &= (short) 0xFF;
  
         // 蓄电池电压
-        this.storageBatteryVoltage = message0280.getStorageBatteryVoltage();
+        this.storageBatteryVoltage &= (short) 0xFF;
  
         // 左前轮胎压力
-        this.lfTirePressure = message0280.getLfTirePressure();
+        this.lfTirePressure &= (short) 0xFF;
  
         // 左前轮胎温度
-        this.lfTireTemp = message0280.getLfTireTemp();
+        this.lfTireTemp &= (short) 0xFF;
+        this.lfTireTemp -=40;
  
         // 右前轮胎压力
-        this.rfTirePressure = message0280.getRfTirePressure();
+        this.rfTirePressure &= (short) 0xFF;
  
         // 右前轮胎温度
-        this.rfTireTemp = message0280.getRfTireTemp();
+        this.rfTireTemp &= (short) 0xFF;
+        this.rfTireTemp -=40;
  
         // 左后轮胎1压力
-        this.lrTirePressure1 = message0280.getLrTirePressure1();
+        this.lrTirePressure1 &= (short) 0xFF;
  
         // 左后轮胎1温度
         this.lrTireTemp1 = message0280.getLrTireTemp1();
+        this.lrTireTemp1 -=40;
  
         // 左后轮胎2压力
         this.lrTirePressure2 = message0280.getLrTirePressure2();
  
         // 左后轮胎2温度
         this.lrTireTemp2 = message0280.getLrTireTemp2();
+        this.lrTireTemp2 -=40;
  
         // 右后轮胎1压力
         this.rrTirePressure1 = message0280.getRrTirePressure1();
  
         // 右后轮胎1温度
         this.rrTireTemp1 = message0280.getRrTireTemp1();
+        this.rrTireTemp1 -=40;
  
         // 右后轮胎2压力
         this.rrTirePressure2 = message0280.getRrTirePressure2();
  
         // 右后轮胎2温度
         this.rrTireTemp2 = message0280.getRrTireTemp2();
+        this.rrTireTemp2 -=40;
  
  
  
 package com.bsth.entity;
 import com.bsth.socket.protocol.Message0203;
+import org.springframework.beans.BeanUtils;
  
  
 public class FuelCellData extends Data{
@@ -105,19 +106,22 @@ public class FuelCellData extends Data{
     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();
+        BeanUtils.copyProperties(message0203, this);
+        this.infoType  &= (short) 0xFF;
+        this.voltage &= (short) 0xFF;
+        this.current &= (short) 0xFF;
+        this.fuelConsumeRate  &= (short) 0xFF;
+        this.tempProbeQuantity  &= (short) 0xFF;
+        for (int i = 0; i < temps.length; i++) {
+            this.temps[i] -= 40; }
+        this.hydrogenMaxTemp  &= (short) 0xFF;
+        this.hydrogenMaxTemp -=40;
+        this.maxTempSensorCode &= (short) 0xFF;
+        this.hydrogenMaxConcentration  &= (short) 0xFF;
+        this.maxConcentrationSensorCode &= (short) 0xFF;
+        this.hydrogenMaxPressure  &= (short) 0xFF;
+        this.maxPressureSensorCode  &= (short) 0xFF;
+        this.dcState  &= (short) 0xFF;
     }
  
  
 package com.bsth.entity;
 import com.bsth.socket.protocol.Message0281;
+import org.springframework.beans.BeanUtils;
  
 public class TerminalCollectData extends Data {
  
@@ -62,30 +63,31 @@ public class TerminalCollectData extends Data {
     private short totalCurrent;
  
     public TerminalCollectData(Message0281 message0281){
+        BeanUtils.copyProperties(message0281, this);
  
-        this.acceleratorFlag = message0281.getDataList().get(0).getAcceleratorFlag() != 0xFF ? message0281.getDataList().get(0).getAcceleratorFlag() : (byte) 0x01;
+        this.acceleratorFlag  &= (short) 0xFF;
  
         // 加速踏板行程值
-        this.acceleratorState = message0281.getDataList().get(0).getAcceleratorState();
+        this.acceleratorState  &= (short) 0xFF;
  
         // 制动踏板标识类型，默认应该为0x02
-        this.brakePedalFlag = message0281.getDataList().get(0).getBrakePedalFlag() != 0xFF ? message0281.getDataList().get(0).getBrakePedalFlag() : (byte) 0x02;
+        this.brakePedalFlag  &= (short) 0xFF;
  
         // 制动踏板状态
-        this.brakePedalState = message0281.getDataList().get(0).getBrakePedalState();
+        this.brakePedalState &= (short) 0xFF;
  
  
         // 车速标识类型，默认应该为0x03
-        this.speedFlag = message0281.getDataList().get(0).getSpeedFlag() != 0xFF ? message0281.getDataList().get(0).getSpeedFlag() : (byte) 0x03;
+        this.speedFlag  &= (short) 0xFF;
  
         // 车速
-        this.speed = message0281.getDataList().get(0).getSpeed();
+        this.speed  &= (short) 0xFF;
  
         // 总电流标识类型，默认应该为0x04
-        this.totalCurrentFlag = message0281.getDataList().get(0).getTotalCurrentFlag() != 0xFF ? message0281.getDataList().get(0).getTotalCurrentFlag() : (byte) 0x04;
+        this.totalCurrentFlag &= (short) 0xFF;
  
         // 总电流
-        this.totalCurrent = message0281.getDataList().get(0).getTotalCurrent();
+        this.totalCurrent  &= (short) 0xFF;
  
  
  
@@ -43,6 +43,9 @@ public class VehicleLocationData extends Data {
  
         // 纬度
         this.lat = message0205.getLat();
+        this.locationState &= (short) 0xFF;
+        this.lon &= (short) 0xFF;
+        this.lat &= (short) 0xFF;
  
  
     }