Merge branch 'master' of http://61.169.120.202:8888/wt11111111/gb32960_server

“fan1305”
2 parents c181b71e 88a30754
Showing 6 changed files with 328 additions and 51 deletions
.gitignore
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
src/main/webapp/WEB-INF/web.xml
+/gb32960_server.iml
+/.idea/
+/.gitignore
+/target
 \ No newline at end of file
@@ -189,7 +189,133 @@ public class ExtendData extends Data{
     }
+    public byte getInfoType() {
+        return infoType;
+    }
+
+    public void setInfoType(byte infoType) {
+        this.infoType = infoType;
+    }
+
+    public short getCustomDataLen() {
+        return customDataLen;
+    }
+
+    public void setCustomDataLen(short customDataLen) {
+        this.customDataLen = customDataLen;
+    }
+
+    public byte getStorageBatteryVoltage() {
+        return storageBatteryVoltage;
+    }
+
+    public void setStorageBatteryVoltage(byte storageBatteryVoltage) {
+        this.storageBatteryVoltage = storageBatteryVoltage;
+    }
+
+    public byte getLfTirePressure() {
+        return lfTirePressure;
+    }
+
+    public void setLfTirePressure(byte lfTirePressure) {
+        this.lfTirePressure = lfTirePressure;
+    }
+
+    public byte getLfTireTemp() {
+        return lfTireTemp;
+    }
+
+    public void setLfTireTemp(byte lfTireTemp) {
+        this.lfTireTemp = lfTireTemp;
+    }
+
+    public byte getRfTirePressure() {
+        return rfTirePressure;
+    }
+
+    public void setRfTirePressure(byte rfTirePressure) {
+        this.rfTirePressure = rfTirePressure;
+    }
+
+    public byte getRfTireTemp() {
+        return rfTireTemp;
+    }
+
+    public void setRfTireTemp(byte rfTireTemp) {
+        this.rfTireTemp = rfTireTemp;
+    }
+
+    public byte getLrTirePressure1() {
+        return lrTirePressure1;
+    }
+
+    public void setLrTirePressure1(byte lrTirePressure1) {
+        this.lrTirePressure1 = lrTirePressure1;
+    }
+    public byte getLrTireTemp1() {
+        return lrTireTemp1;
+    }
+
+    public void setLrTireTemp1(byte lrTireTemp1) {
+        this.lrTireTemp1 = lrTireTemp1;
+    }
+
+    public byte getLrTirePressure2() {
+        return lrTirePressure2;
+    }
+
+    public void setLrTirePressure2(byte lrTirePressure2) {
+        this.lrTirePressure2 = lrTirePressure2;
+    }
+
+    public byte getLrTireTemp2() {
+        return lrTireTemp2;
+    }
+
+    public void setLrTireTemp2(byte lrTireTemp2) {
+        this.lrTireTemp2 = lrTireTemp2;
+    }
+
+    public byte getRrTirePressure1() {
+        return rrTirePressure1;
+    }
+
+    public void setRrTirePressure1(byte rrTirePressure1) {
+        this.rrTirePressure1 = rrTirePressure1;
+    }
+
+    public byte getRrTireTemp1() {
+        return rrTireTemp1;
+    }
+
+    public void setRrTireTemp1(byte rrTireTemp1) {
+        this.rrTireTemp1 = rrTireTemp1;
+    }
+
+    public byte getRrTirePressure2() {
+        return rrTirePressure2;
+    }
+
+    public void setRrTirePressure2(byte rrTirePressure2) {
+        this.rrTirePressure2 = rrTirePressure2;
+    }
+
+    public byte getRrTireTemp2() {
+        return rrTireTemp2;
+    }
+
+    public void setRrTireTemp2(byte rrTireTemp2) {
+        this.rrTireTemp2 = rrTireTemp2;
+    }
+
+    public byte getUnknown() {
+        return unknown;
+    }
+
+    public void setUnknown(byte unknown) {
+        this.unknown = unknown;
+    }
     @Override
     public String toString() {
@@ -124,7 +124,109 @@ public class FuelCellData extends Data{
         this.dcState  &= (short) 0xFF;
     }
+    public byte getInfoType() {
+        return infoType;
+    }
+
+    public void setInfoType(byte infoType) {
+        this.infoType = infoType;
+    }
+
+    public short getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(short voltage) {
+        this.voltage = voltage;
+    }
+
+    public short getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(short current) {
+        this.current = current;
+    }
+
+    public short getFuelConsumeRate() {
+        return fuelConsumeRate;
+    }
+
+    public void setFuelConsumeRate(short fuelConsumeRate) {
+        this.fuelConsumeRate = fuelConsumeRate;
+    }
+
+    public short getTempProbeQuantity() {
+        return tempProbeQuantity;
+    }
+
+    public void setTempProbeQuantity(short tempProbeQuantity) {
+        this.tempProbeQuantity = tempProbeQuantity;
+    }
+
+    public byte[] getTemps() {
+        return temps;
+    }
+
+    public void setTemps(byte[] temps) {
+        this.temps = temps;
+    }
+
+    public short getHydrogenMaxTemp() {
+        return hydrogenMaxTemp;
+    }
+    public void setHydrogenMaxTemp(short hydrogenMaxTemp) {
+        this.hydrogenMaxTemp = hydrogenMaxTemp;
+    }
+
+    public byte getMaxTempSensorCode() {
+        return maxTempSensorCode;
+    }
+
+    public void setMaxTempSensorCode(byte maxTempSensorCode) {
+        this.maxTempSensorCode = maxTempSensorCode;
+    }
+
+    public short getHydrogenMaxConcentration() {
+        return hydrogenMaxConcentration;
+    }
+
+    public void setHydrogenMaxConcentration(short hydrogenMaxConcentration) {
+        this.hydrogenMaxConcentration = hydrogenMaxConcentration;
+    }
+
+    public byte getMaxConcentrationSensorCode() {
+        return maxConcentrationSensorCode;
+    }
+
+    public void setMaxConcentrationSensorCode(byte maxConcentrationSensorCode) {
+        this.maxConcentrationSensorCode = maxConcentrationSensorCode;
+    }
+
+    public short getHydrogenMaxPressure() {
+        return hydrogenMaxPressure;
+    }
+
+    public void setHydrogenMaxPressure(short hydrogenMaxPressure) {
+        this.hydrogenMaxPressure = hydrogenMaxPressure;
+    }
+
+    public byte getMaxPressureSensorCode() {
+        return maxPressureSensorCode;
+    }
+
+    public void setMaxPressureSensorCode(byte maxPressureSensorCode) {
+        this.maxPressureSensorCode = maxPressureSensorCode;
+    }
+
+    public byte getDcState() {
+        return dcState;
+    }
+
+    public void setDcState(byte dcState) {
+        this.dcState = dcState;
+    }
     @Override
     public String toString() {
@@ -93,6 +93,70 @@ public class TerminalCollectData extends Data {
     }
+    public byte getAcceleratorFlag() {
+        return acceleratorFlag;
+    }
+
+    public void setAcceleratorFlag(byte acceleratorFlag) {
+        this.acceleratorFlag = acceleratorFlag;
+    }
+
+    public byte getAcceleratorState() {
+        return acceleratorState;
+    }
+
+    public void setAcceleratorState(byte acceleratorState) {
+        this.acceleratorState = acceleratorState;
+    }
+
+    public byte getBrakePedalFlag() {
+        return brakePedalFlag;
+    }
+
+    public void setBrakePedalFlag(byte brakePedalFlag) {
+        this.brakePedalFlag = brakePedalFlag;
+    }
+
+    public byte getBrakePedalState() {
+        return brakePedalState;
+    }
+
+    public void setBrakePedalState(byte brakePedalState) {
+        this.brakePedalState = brakePedalState;
+    }
+
+    public byte getSpeedFlag() {
+        return speedFlag;
+    }
+
+    public void setSpeedFlag(byte speedFlag) {
+        this.speedFlag = speedFlag;
+    }
+
+    public short getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(short speed) {
+        this.speed = speed;
+    }
+
+    public byte getTotalCurrentFlag() {
+        return totalCurrentFlag;
+    }
+
+    public void setTotalCurrentFlag(byte totalCurrentFlag) {
+        this.totalCurrentFlag = totalCurrentFlag;
+    }
+
+    public short getTotalCurrent() {
+        return totalCurrent;
+    }
+
+    public void setTotalCurrent(short totalCurrent) {
+        this.totalCurrent = totalCurrent;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -50,6 +50,38 @@ public class VehicleLocationData extends Data {
     }
+    public byte getInfoType() {
+        return infoType;
+    }
+
+    public void setInfoType(byte infoType) {
+        this.infoType = infoType;
+    }
+
+    public byte getLocationState() {
+        return locationState;
+    }
+
+    public void setLocationState(byte locationState) {
+        this.locationState = locationState;
+    }
+
+    public int getLon() {
+        return lon;
+    }
+
+    public void setLon(int lon) {
+        this.lon = lon;
+    }
+
+    public int getLat() {
+        return lat;
+    }
+
+    public void setLat(int lat) {
+        this.lat = lat;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" 
-	xmlns="http://java.sun.com/xml/ns/javaee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-	http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-	
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>
-		classpath:spring-application.xml;
-<!-- 		classpath:spring-quartz.xml; -->
-	</param-value>
-  </context-param>
-  <filter>
-    <filter-name>encode</filter-name>
-    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-    <init-param>
-      <param-name>encoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-    <init-param>
-      <param-name>forceEncoding</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>encode</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <servlet>
-    <servlet-name>springmvc</servlet-name>
-    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-    <init-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>classpath:spring-servlet.xml</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>springmvc</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-  <display-name></display-name>	
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>