From 733060b40566eb40969ec69e450d1fb24f4b579c Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 02 九月 2019 10:12:44 +0800 Subject: [PATCH] 添加新的三张数据库表格 --- src/main/resources/mapper/AlarmDataMapper.xml | 58 ++ src/main/kotlin/com/flightfeather/obd/domain/entity/AlarmData.java | 619 ++++++++++++++++++++++++++ src/main/kotlin/com/flightfeather/obd/domain/entity/ObdUser.java | 91 +++ src/main/kotlin/com/flightfeather/obd/lightshare/bean/ObdDataVo.kt | 2 src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt | 2 src/main/kotlin/com/flightfeather/obd/domain/entity/ThresholdValue.java | 499 +++++++++++++++++++++ src/main/resources/generator/generatorConfig.xml | 7 src/main/kotlin/com/flightfeather/obd/lightshare/bean/BaseJson.kt | 5 src/main/resources/mapper/ThresholdValueMapper.xml | 49 ++ src/main/kotlin/com/flightfeather/obd/domain/mapper/AlarmDataMapper.kt | 8 src/main/resources/mapper/ObdUserMapper.xml | 20 src/main/kotlin/com/flightfeather/obd/domain/mapper/ObdUserMapper.kt | 8 src/main/resources/application.yml | 2 src/main/kotlin/com/flightfeather/obd/domain/mapper/ThresholdValueMapper.kt | 8 14 files changed, 1,371 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/obd/domain/entity/AlarmData.java b/src/main/kotlin/com/flightfeather/obd/domain/entity/AlarmData.java new file mode 100644 index 0000000..900a45a --- /dev/null +++ b/src/main/kotlin/com/flightfeather/obd/domain/entity/AlarmData.java @@ -0,0 +1,619 @@ +package com.flightfeather.obd.domain.entity; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "obd_alarm_data") +public class AlarmData { + @Id + private Integer id; + + @Column(name = "obd_vin") + private String obdVin; + + @Column(name = "alarm_time") + private Date alarmTime; + + @Column(name = "alarm_lng") + private Double alarmLng; + + @Column(name = "alarm_lat") + private Double alarmLat; + + @Column(name = "alarm_protocol") + private Integer alarmProtocol; + + @Column(name = "alarm_mil") + private Integer alarmMil; + + @Column(name = "alarm_id_code") + private String alarmIdCode; + + @Column(name = "alarm_verification_code") + private String alarmVerificationCode; + + @Column(name = "alarm_fault_code_num") + private Integer alarmFaultCodeNum; + + @Column(name = "alarm_fault_code") + private String alarmFaultCode; + + @Column(name = "alarm_speed") + private Integer alarmSpeed; + + @Column(name = "alarm_air_pressure") + private Double alarmAirPressure; + + @Column(name = "alarm_engine_torque") + private Double alarmEngineTorque; + + @Column(name = "alarm_friction_torque") + private Double alarmFrictionTorque; + + @Column(name = "alarm_engine_rpm") + private Integer alarmEngineRpm; + + @Column(name = "alarm_start_fuel_flow") + private Double alarmStartFuelFlow; + + @Column(name = "alarm_scr_upstream_NO") + private Double alarmScrUpstreamNo; + + @Column(name = "alarm_scr_downstream_NO") + private Double alarmScrDownstreamNo; + + @Column(name = "alarm_remain_reactant") + private Double alarmRemainReactant; + + @Column(name = "alarm_air_input") + private Double alarmAirInput; + + @Column(name = "alarm_scr_input_temp") + private Double alarmScrInputTemp; + + @Column(name = "alarm_scr_output_temp") + private Double alarmScrOutputTemp; + + @Column(name = "alarm_DPF") + private Double alarmDpf; + + @Column(name = "alarm_engine_coolant_temp") + private Double alarmEngineCoolantTemp; + + @Column(name = "alarm_fuel_level") + private Double alarmFuelLevel; + + @Column(name = "alarm_location_status") + private Integer alarmLocationStatus; + + @Column(name = "alarm_total_mileage") + private Double alarmTotalMileage; + + @Column(name = "alarm_engine_torque_mode") + private String alarmEngineTorqueMode; + + @Column(name = "alarm_accelerator_pedal") + private Double alarmAcceleratorPedal; + + @Column(name = "alarm_total_oil_consumption") + private Double alarmTotalOilConsumption; + + @Column(name = "alarm_urea_box_temp") + private Double alarmUreaBoxTemp; + + @Column(name = "alarm_urea_volume") + private Integer alarmUreaVolume; + + @Column(name = "alarm_total_urea_consume") + private Double alarmTotalUreaConsume; + + @Column(name = "alarm_DPF_temp") + private Double alarmDpfTemp; + + @Column(name = "alarm_firmware_version") + private String alarmFirmwareVersion; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * @return obd_vin + */ + public String getObdVin() { + return obdVin; + } + + /** + * @param obdVin + */ + public void setObdVin(String obdVin) { + this.obdVin = obdVin == null ? null : obdVin.trim(); + } + + /** + * @return alarm_time + */ + public Date getAlarmTime() { + return alarmTime; + } + + /** + * @param alarmTime + */ + public void setAlarmTime(Date alarmTime) { + this.alarmTime = alarmTime; + } + + /** + * @return alarm_lng + */ + public Double getAlarmLng() { + return alarmLng; + } + + /** + * @param alarmLng + */ + public void setAlarmLng(Double alarmLng) { + this.alarmLng = alarmLng; + } + + /** + * @return alarm_lat + */ + public Double getAlarmLat() { + return alarmLat; + } + + /** + * @param alarmLat + */ + public void setAlarmLat(Double alarmLat) { + this.alarmLat = alarmLat; + } + + /** + * @return alarm_protocol + */ + public Integer getAlarmProtocol() { + return alarmProtocol; + } + + /** + * @param alarmProtocol + */ + public void setAlarmProtocol(Integer alarmProtocol) { + this.alarmProtocol = alarmProtocol; + } + + /** + * @return alarm_mil + */ + public Integer getAlarmMil() { + return alarmMil; + } + + /** + * @param alarmMil + */ + public void setAlarmMil(Integer alarmMil) { + this.alarmMil = alarmMil; + } + + /** + * @return alarm_id_code + */ + public String getAlarmIdCode() { + return alarmIdCode; + } + + /** + * @param alarmIdCode + */ + public void setAlarmIdCode(String alarmIdCode) { + this.alarmIdCode = alarmIdCode == null ? null : alarmIdCode.trim(); + } + + /** + * @return alarm_verification_code + */ + public String getAlarmVerificationCode() { + return alarmVerificationCode; + } + + /** + * @param alarmVerificationCode + */ + public void setAlarmVerificationCode(String alarmVerificationCode) { + this.alarmVerificationCode = alarmVerificationCode == null ? null : alarmVerificationCode.trim(); + } + + /** + * @return alarm_fault_code_num + */ + public Integer getAlarmFaultCodeNum() { + return alarmFaultCodeNum; + } + + /** + * @param alarmFaultCodeNum + */ + public void setAlarmFaultCodeNum(Integer alarmFaultCodeNum) { + this.alarmFaultCodeNum = alarmFaultCodeNum; + } + + /** + * @return alarm_fault_code + */ + public String getAlarmFaultCode() { + return alarmFaultCode; + } + + /** + * @param alarmFaultCode + */ + public void setAlarmFaultCode(String alarmFaultCode) { + this.alarmFaultCode = alarmFaultCode == null ? null : alarmFaultCode.trim(); + } + + /** + * @return alarm_speed + */ + public Integer getAlarmSpeed() { + return alarmSpeed; + } + + /** + * @param alarmSpeed + */ + public void setAlarmSpeed(Integer alarmSpeed) { + this.alarmSpeed = alarmSpeed; + } + + /** + * @return alarm_air_pressure + */ + public Double getAlarmAirPressure() { + return alarmAirPressure; + } + + /** + * @param alarmAirPressure + */ + public void setAlarmAirPressure(Double alarmAirPressure) { + this.alarmAirPressure = alarmAirPressure; + } + + /** + * @return alarm_engine_torque + */ + public Double getAlarmEngineTorque() { + return alarmEngineTorque; + } + + /** + * @param alarmEngineTorque + */ + public void setAlarmEngineTorque(Double alarmEngineTorque) { + this.alarmEngineTorque = alarmEngineTorque; + } + + /** + * @return alarm_friction_torque + */ + public Double getAlarmFrictionTorque() { + return alarmFrictionTorque; + } + + /** + * @param alarmFrictionTorque + */ + public void setAlarmFrictionTorque(Double alarmFrictionTorque) { + this.alarmFrictionTorque = alarmFrictionTorque; + } + + /** + * @return alarm_engine_rpm + */ + public Integer getAlarmEngineRpm() { + return alarmEngineRpm; + } + + /** + * @param alarmEngineRpm + */ + public void setAlarmEngineRpm(Integer alarmEngineRpm) { + this.alarmEngineRpm = alarmEngineRpm; + } + + /** + * @return alarm_start_fuel_flow + */ + public Double getAlarmStartFuelFlow() { + return alarmStartFuelFlow; + } + + /** + * @param alarmStartFuelFlow + */ + public void setAlarmStartFuelFlow(Double alarmStartFuelFlow) { + this.alarmStartFuelFlow = alarmStartFuelFlow; + } + + /** + * @return alarm_scr_upstream_NO + */ + public Double getAlarmScrUpstreamNo() { + return alarmScrUpstreamNo; + } + + /** + * @param alarmScrUpstreamNo + */ + public void setAlarmScrUpstreamNo(Double alarmScrUpstreamNo) { + this.alarmScrUpstreamNo = alarmScrUpstreamNo; + } + + /** + * @return alarm_scr_downstream_NO + */ + public Double getAlarmScrDownstreamNo() { + return alarmScrDownstreamNo; + } + + /** + * @param alarmScrDownstreamNo + */ + public void setAlarmScrDownstreamNo(Double alarmScrDownstreamNo) { + this.alarmScrDownstreamNo = alarmScrDownstreamNo; + } + + /** + * @return alarm_remain_reactant + */ + public Double getAlarmRemainReactant() { + return alarmRemainReactant; + } + + /** + * @param alarmRemainReactant + */ + public void setAlarmRemainReactant(Double alarmRemainReactant) { + this.alarmRemainReactant = alarmRemainReactant; + } + + /** + * @return alarm_air_input + */ + public Double getAlarmAirInput() { + return alarmAirInput; + } + + /** + * @param alarmAirInput + */ + public void setAlarmAirInput(Double alarmAirInput) { + this.alarmAirInput = alarmAirInput; + } + + /** + * @return alarm_scr_input_temp + */ + public Double getAlarmScrInputTemp() { + return alarmScrInputTemp; + } + + /** + * @param alarmScrInputTemp + */ + public void setAlarmScrInputTemp(Double alarmScrInputTemp) { + this.alarmScrInputTemp = alarmScrInputTemp; + } + + /** + * @return alarm_scr_output_temp + */ + public Double getAlarmScrOutputTemp() { + return alarmScrOutputTemp; + } + + /** + * @param alarmScrOutputTemp + */ + public void setAlarmScrOutputTemp(Double alarmScrOutputTemp) { + this.alarmScrOutputTemp = alarmScrOutputTemp; + } + + /** + * @return alarm_DPF + */ + public Double getAlarmDpf() { + return alarmDpf; + } + + /** + * @param alarmDpf + */ + public void setAlarmDpf(Double alarmDpf) { + this.alarmDpf = alarmDpf; + } + + /** + * @return alarm_engine_coolant_temp + */ + public Double getAlarmEngineCoolantTemp() { + return alarmEngineCoolantTemp; + } + + /** + * @param alarmEngineCoolantTemp + */ + public void setAlarmEngineCoolantTemp(Double alarmEngineCoolantTemp) { + this.alarmEngineCoolantTemp = alarmEngineCoolantTemp; + } + + /** + * @return alarm_fuel_level + */ + public Double getAlarmFuelLevel() { + return alarmFuelLevel; + } + + /** + * @param alarmFuelLevel + */ + public void setAlarmFuelLevel(Double alarmFuelLevel) { + this.alarmFuelLevel = alarmFuelLevel; + } + + /** + * @return alarm_location_status + */ + public Integer getAlarmLocationStatus() { + return alarmLocationStatus; + } + + /** + * @param alarmLocationStatus + */ + public void setAlarmLocationStatus(Integer alarmLocationStatus) { + this.alarmLocationStatus = alarmLocationStatus; + } + + /** + * @return alarm_total_mileage + */ + public Double getAlarmTotalMileage() { + return alarmTotalMileage; + } + + /** + * @param alarmTotalMileage + */ + public void setAlarmTotalMileage(Double alarmTotalMileage) { + this.alarmTotalMileage = alarmTotalMileage; + } + + /** + * @return alarm_engine_torque_mode + */ + public String getAlarmEngineTorqueMode() { + return alarmEngineTorqueMode; + } + + /** + * @param alarmEngineTorqueMode + */ + public void setAlarmEngineTorqueMode(String alarmEngineTorqueMode) { + this.alarmEngineTorqueMode = alarmEngineTorqueMode == null ? null : alarmEngineTorqueMode.trim(); + } + + /** + * @return alarm_accelerator_pedal + */ + public Double getAlarmAcceleratorPedal() { + return alarmAcceleratorPedal; + } + + /** + * @param alarmAcceleratorPedal + */ + public void setAlarmAcceleratorPedal(Double alarmAcceleratorPedal) { + this.alarmAcceleratorPedal = alarmAcceleratorPedal; + } + + /** + * @return alarm_total_oil_consumption + */ + public Double getAlarmTotalOilConsumption() { + return alarmTotalOilConsumption; + } + + /** + * @param alarmTotalOilConsumption + */ + public void setAlarmTotalOilConsumption(Double alarmTotalOilConsumption) { + this.alarmTotalOilConsumption = alarmTotalOilConsumption; + } + + /** + * @return alarm_urea_box_temp + */ + public Double getAlarmUreaBoxTemp() { + return alarmUreaBoxTemp; + } + + /** + * @param alarmUreaBoxTemp + */ + public void setAlarmUreaBoxTemp(Double alarmUreaBoxTemp) { + this.alarmUreaBoxTemp = alarmUreaBoxTemp; + } + + /** + * @return alarm_urea_volume + */ + public Integer getAlarmUreaVolume() { + return alarmUreaVolume; + } + + /** + * @param alarmUreaVolume + */ + public void setAlarmUreaVolume(Integer alarmUreaVolume) { + this.alarmUreaVolume = alarmUreaVolume; + } + + /** + * @return alarm_total_urea_consume + */ + public Double getAlarmTotalUreaConsume() { + return alarmTotalUreaConsume; + } + + /** + * @param alarmTotalUreaConsume + */ + public void setAlarmTotalUreaConsume(Double alarmTotalUreaConsume) { + this.alarmTotalUreaConsume = alarmTotalUreaConsume; + } + + /** + * @return alarm_DPF_temp + */ + public Double getAlarmDpfTemp() { + return alarmDpfTemp; + } + + /** + * @param alarmDpfTemp + */ + public void setAlarmDpfTemp(Double alarmDpfTemp) { + this.alarmDpfTemp = alarmDpfTemp; + } + + /** + * @return alarm_firmware_version + */ + public String getAlarmFirmwareVersion() { + return alarmFirmwareVersion; + } + + /** + * @param alarmFirmwareVersion + */ + public void setAlarmFirmwareVersion(String alarmFirmwareVersion) { + this.alarmFirmwareVersion = alarmFirmwareVersion == null ? null : alarmFirmwareVersion.trim(); + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/domain/entity/ObdUser.java b/src/main/kotlin/com/flightfeather/obd/domain/entity/ObdUser.java new file mode 100644 index 0000000..2d6a802 --- /dev/null +++ b/src/main/kotlin/com/flightfeather/obd/domain/entity/ObdUser.java @@ -0,0 +1,91 @@ +package com.flightfeather.obd.domain.entity; + +import javax.persistence.*; + +@Table(name = "obd_user") +public class ObdUser { + @Id + private Integer id; + + @Column(name = "obd_vin") + private String obdVin; + + @Column(name = "obd_user_id") + private Double obdUserId; + + @Column(name = "obd_user_name") + private String obdUserName; + + @Column(name = "obd_user_password") + private String obdUserPassword; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * @return obd_vin + */ + public String getObdVin() { + return obdVin; + } + + /** + * @param obdVin + */ + public void setObdVin(String obdVin) { + this.obdVin = obdVin == null ? null : obdVin.trim(); + } + + /** + * @return obd_user_id + */ + public Double getObdUserId() { + return obdUserId; + } + + /** + * @param obdUserId + */ + public void setObdUserId(Double obdUserId) { + this.obdUserId = obdUserId; + } + + /** + * @return obd_user_name + */ + public String getObdUserName() { + return obdUserName; + } + + /** + * @param obdUserName + */ + public void setObdUserName(String obdUserName) { + this.obdUserName = obdUserName == null ? null : obdUserName.trim(); + } + + /** + * @return obd_user_password + */ + public String getObdUserPassword() { + return obdUserPassword; + } + + /** + * @param obdUserPassword + */ + public void setObdUserPassword(String obdUserPassword) { + this.obdUserPassword = obdUserPassword == null ? null : obdUserPassword.trim(); + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/domain/entity/ThresholdValue.java b/src/main/kotlin/com/flightfeather/obd/domain/entity/ThresholdValue.java new file mode 100644 index 0000000..61b2e12 --- /dev/null +++ b/src/main/kotlin/com/flightfeather/obd/domain/entity/ThresholdValue.java @@ -0,0 +1,499 @@ +package com.flightfeather.obd.domain.entity; + +import javax.persistence.*; + +@Table(name = "obd_threshold_value") +public class ThresholdValue { + @Id + private Integer id; + + @Column(name = "obd_vin") + private String obdVin; + + @Column(name = "th_mil") + private Integer thMil; + + @Column(name = "th_fault_code_num") + private Integer thFaultCodeNum; + + @Column(name = "th_fault_code") + private String thFaultCode; + + @Column(name = "th_speed") + private Integer thSpeed; + + @Column(name = "th_air_pressure") + private Double thAirPressure; + + @Column(name = "th_engine_torque") + private Double thEngineTorque; + + @Column(name = "th_friction_torque") + private Double thFrictionTorque; + + @Column(name = "th_engine_rpm") + private Integer thEngineRpm; + + @Column(name = "th_start_fuel_flow") + private Double thStartFuelFlow; + + @Column(name = "th_scr_upstream_NO") + private Double thScrUpstreamNo; + + @Column(name = "th_scr_downstream_NO") + private Double thScrDownstreamNo; + + @Column(name = "th_remain_reactant") + private Double thRemainReactant; + + @Column(name = "th_air_input") + private Double thAirInput; + + @Column(name = "th_scr_input_temp") + private Double thScrInputTemp; + + @Column(name = "th_scr_output_temp") + private Double thScrOutputTemp; + + @Column(name = "th_DPF") + private Double thDpf; + + @Column(name = "th_engine_coolant_temp") + private Double thEngineCoolantTemp; + + @Column(name = "th_fuel_level") + private Double thFuelLevel; + + @Column(name = "th_location_status") + private Integer thLocationStatus; + + @Column(name = "th_total_mileage") + private Double thTotalMileage; + + @Column(name = "th_engine_torque_mode") + private String thEngineTorqueMode; + + @Column(name = "th_accelerator_pedal") + private Double thAcceleratorPedal; + + @Column(name = "th_total_oil_consumption") + private Double thTotalOilConsumption; + + @Column(name = "th_urea_box_temp") + private Double thUreaBoxTemp; + + @Column(name = "th_urea_volume") + private Integer thUreaVolume; + + @Column(name = "th_total_urea_consume") + private Double thTotalUreaConsume; + + @Column(name = "th_DPF_temp") + private Double thDpfTemp; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * @return obd_vin + */ + public String getObdVin() { + return obdVin; + } + + /** + * @param obdVin + */ + public void setObdVin(String obdVin) { + this.obdVin = obdVin == null ? null : obdVin.trim(); + } + + /** + * @return th_mil + */ + public Integer getThMil() { + return thMil; + } + + /** + * @param thMil + */ + public void setThMil(Integer thMil) { + this.thMil = thMil; + } + + /** + * @return th_fault_code_num + */ + public Integer getThFaultCodeNum() { + return thFaultCodeNum; + } + + /** + * @param thFaultCodeNum + */ + public void setThFaultCodeNum(Integer thFaultCodeNum) { + this.thFaultCodeNum = thFaultCodeNum; + } + + /** + * @return th_fault_code + */ + public String getThFaultCode() { + return thFaultCode; + } + + /** + * @param thFaultCode + */ + public void setThFaultCode(String thFaultCode) { + this.thFaultCode = thFaultCode == null ? null : thFaultCode.trim(); + } + + /** + * @return th_speed + */ + public Integer getThSpeed() { + return thSpeed; + } + + /** + * @param thSpeed + */ + public void setThSpeed(Integer thSpeed) { + this.thSpeed = thSpeed; + } + + /** + * @return th_air_pressure + */ + public Double getThAirPressure() { + return thAirPressure; + } + + /** + * @param thAirPressure + */ + public void setThAirPressure(Double thAirPressure) { + this.thAirPressure = thAirPressure; + } + + /** + * @return th_engine_torque + */ + public Double getThEngineTorque() { + return thEngineTorque; + } + + /** + * @param thEngineTorque + */ + public void setThEngineTorque(Double thEngineTorque) { + this.thEngineTorque = thEngineTorque; + } + + /** + * @return th_friction_torque + */ + public Double getThFrictionTorque() { + return thFrictionTorque; + } + + /** + * @param thFrictionTorque + */ + public void setThFrictionTorque(Double thFrictionTorque) { + this.thFrictionTorque = thFrictionTorque; + } + + /** + * @return th_engine_rpm + */ + public Integer getThEngineRpm() { + return thEngineRpm; + } + + /** + * @param thEngineRpm + */ + public void setThEngineRpm(Integer thEngineRpm) { + this.thEngineRpm = thEngineRpm; + } + + /** + * @return th_start_fuel_flow + */ + public Double getThStartFuelFlow() { + return thStartFuelFlow; + } + + /** + * @param thStartFuelFlow + */ + public void setThStartFuelFlow(Double thStartFuelFlow) { + this.thStartFuelFlow = thStartFuelFlow; + } + + /** + * @return th_scr_upstream_NO + */ + public Double getThScrUpstreamNo() { + return thScrUpstreamNo; + } + + /** + * @param thScrUpstreamNo + */ + public void setThScrUpstreamNo(Double thScrUpstreamNo) { + this.thScrUpstreamNo = thScrUpstreamNo; + } + + /** + * @return th_scr_downstream_NO + */ + public Double getThScrDownstreamNo() { + return thScrDownstreamNo; + } + + /** + * @param thScrDownstreamNo + */ + public void setThScrDownstreamNo(Double thScrDownstreamNo) { + this.thScrDownstreamNo = thScrDownstreamNo; + } + + /** + * @return th_remain_reactant + */ + public Double getThRemainReactant() { + return thRemainReactant; + } + + /** + * @param thRemainReactant + */ + public void setThRemainReactant(Double thRemainReactant) { + this.thRemainReactant = thRemainReactant; + } + + /** + * @return th_air_input + */ + public Double getThAirInput() { + return thAirInput; + } + + /** + * @param thAirInput + */ + public void setThAirInput(Double thAirInput) { + this.thAirInput = thAirInput; + } + + /** + * @return th_scr_input_temp + */ + public Double getThScrInputTemp() { + return thScrInputTemp; + } + + /** + * @param thScrInputTemp + */ + public void setThScrInputTemp(Double thScrInputTemp) { + this.thScrInputTemp = thScrInputTemp; + } + + /** + * @return th_scr_output_temp + */ + public Double getThScrOutputTemp() { + return thScrOutputTemp; + } + + /** + * @param thScrOutputTemp + */ + public void setThScrOutputTemp(Double thScrOutputTemp) { + this.thScrOutputTemp = thScrOutputTemp; + } + + /** + * @return th_DPF + */ + public Double getThDpf() { + return thDpf; + } + + /** + * @param thDpf + */ + public void setThDpf(Double thDpf) { + this.thDpf = thDpf; + } + + /** + * @return th_engine_coolant_temp + */ + public Double getThEngineCoolantTemp() { + return thEngineCoolantTemp; + } + + /** + * @param thEngineCoolantTemp + */ + public void setThEngineCoolantTemp(Double thEngineCoolantTemp) { + this.thEngineCoolantTemp = thEngineCoolantTemp; + } + + /** + * @return th_fuel_level + */ + public Double getThFuelLevel() { + return thFuelLevel; + } + + /** + * @param thFuelLevel + */ + public void setThFuelLevel(Double thFuelLevel) { + this.thFuelLevel = thFuelLevel; + } + + /** + * @return th_location_status + */ + public Integer getThLocationStatus() { + return thLocationStatus; + } + + /** + * @param thLocationStatus + */ + public void setThLocationStatus(Integer thLocationStatus) { + this.thLocationStatus = thLocationStatus; + } + + /** + * @return th_total_mileage + */ + public Double getThTotalMileage() { + return thTotalMileage; + } + + /** + * @param thTotalMileage + */ + public void setThTotalMileage(Double thTotalMileage) { + this.thTotalMileage = thTotalMileage; + } + + /** + * @return th_engine_torque_mode + */ + public String getThEngineTorqueMode() { + return thEngineTorqueMode; + } + + /** + * @param thEngineTorqueMode + */ + public void setThEngineTorqueMode(String thEngineTorqueMode) { + this.thEngineTorqueMode = thEngineTorqueMode == null ? null : thEngineTorqueMode.trim(); + } + + /** + * @return th_accelerator_pedal + */ + public Double getThAcceleratorPedal() { + return thAcceleratorPedal; + } + + /** + * @param thAcceleratorPedal + */ + public void setThAcceleratorPedal(Double thAcceleratorPedal) { + this.thAcceleratorPedal = thAcceleratorPedal; + } + + /** + * @return th_total_oil_consumption + */ + public Double getThTotalOilConsumption() { + return thTotalOilConsumption; + } + + /** + * @param thTotalOilConsumption + */ + public void setThTotalOilConsumption(Double thTotalOilConsumption) { + this.thTotalOilConsumption = thTotalOilConsumption; + } + + /** + * @return th_urea_box_temp + */ + public Double getThUreaBoxTemp() { + return thUreaBoxTemp; + } + + /** + * @param thUreaBoxTemp + */ + public void setThUreaBoxTemp(Double thUreaBoxTemp) { + this.thUreaBoxTemp = thUreaBoxTemp; + } + + /** + * @return th_urea_volume + */ + public Integer getThUreaVolume() { + return thUreaVolume; + } + + /** + * @param thUreaVolume + */ + public void setThUreaVolume(Integer thUreaVolume) { + this.thUreaVolume = thUreaVolume; + } + + /** + * @return th_total_urea_consume + */ + public Double getThTotalUreaConsume() { + return thTotalUreaConsume; + } + + /** + * @param thTotalUreaConsume + */ + public void setThTotalUreaConsume(Double thTotalUreaConsume) { + this.thTotalUreaConsume = thTotalUreaConsume; + } + + /** + * @return th_DPF_temp + */ + public Double getThDpfTemp() { + return thDpfTemp; + } + + /** + * @param thDpfTemp + */ + public void setThDpfTemp(Double thDpfTemp) { + this.thDpfTemp = thDpfTemp; + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/domain/mapper/AlarmDataMapper.kt b/src/main/kotlin/com/flightfeather/obd/domain/mapper/AlarmDataMapper.kt new file mode 100644 index 0000000..d4a8dc9 --- /dev/null +++ b/src/main/kotlin/com/flightfeather/obd/domain/mapper/AlarmDataMapper.kt @@ -0,0 +1,8 @@ +package com.flightfeather.obd.domain.mapper + +import com.flightfeather.obd.domain.MyMapper +import com.flightfeather.obd.domain.entity.AlarmData +import org.apache.ibatis.annotations.Mapper + +@Mapper +interface AlarmDataMapper : MyMapper<AlarmData> \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/domain/mapper/ObdUserMapper.kt b/src/main/kotlin/com/flightfeather/obd/domain/mapper/ObdUserMapper.kt new file mode 100644 index 0000000..df3e59d --- /dev/null +++ b/src/main/kotlin/com/flightfeather/obd/domain/mapper/ObdUserMapper.kt @@ -0,0 +1,8 @@ +package com.flightfeather.obd.domain.mapper + +import com.flightfeather.obd.domain.MyMapper +import com.flightfeather.obd.domain.entity.ObdUser +import org.apache.ibatis.annotations.Mapper + +@Mapper +interface ObdUserMapper : MyMapper<ObdUser> \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/domain/mapper/ThresholdValueMapper.kt b/src/main/kotlin/com/flightfeather/obd/domain/mapper/ThresholdValueMapper.kt new file mode 100644 index 0000000..535bb0e --- /dev/null +++ b/src/main/kotlin/com/flightfeather/obd/domain/mapper/ThresholdValueMapper.kt @@ -0,0 +1,8 @@ +package com.flightfeather.obd.domain.mapper + +import com.flightfeather.obd.domain.MyMapper +import com.flightfeather.obd.domain.entity.ThresholdValue +import org.apache.ibatis.annotations.Mapper + +@Mapper +interface ThresholdValueMapper : MyMapper<ThresholdValue> \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/bean/BaseJson.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/bean/BaseJson.kt index fe88122..a489593 100644 --- a/src/main/kotlin/com/flightfeather/obd/lightshare/bean/BaseJson.kt +++ b/src/main/kotlin/com/flightfeather/obd/lightshare/bean/BaseJson.kt @@ -1,10 +1,15 @@ package com.flightfeather.obd.lightshare.bean +import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonInclude + /** * 鍩虹Json缁撴瀯锛屾墍鏈夌殑鏁版嵁浠ユ涓哄熀绫� * @author riku * Date: 2019/8/27 */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) open class BaseJson{ val cmdCode: Int? = null } \ No newline at end of file diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/bean/ObdDataVo.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/bean/ObdDataVo.kt index bf68060..35b228b 100644 --- a/src/main/kotlin/com/flightfeather/obd/lightshare/bean/ObdDataVo.kt +++ b/src/main/kotlin/com/flightfeather/obd/lightshare/bean/ObdDataVo.kt @@ -1,10 +1,8 @@ package com.flightfeather.obd.lightshare.bean -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.google.gson.annotations.SerializedName import java.util.* -@JsonIgnoreProperties(ignoreUnknown = true) class ObdDataVo : BaseJson() { var id: Int? = null @SerializedName("vin") diff --git a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt index 5d3885c..7f58318 100644 --- a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt +++ b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt @@ -31,7 +31,7 @@ //鍒嗛〉 val offset = (pageSize?.times(pageNum?.minus(1) ?: 0)) ?: 0 - val a = PageHelper.offsetPage<ObdData>(offset, pageSize ?: 10) + PageHelper.offsetPage<ObdData>(offset, pageSize ?: 10) val result = obdDataMapper.selectByExample(example) val resultList = mutableListOf<ObdDataVo>() diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2b6df51..cf37a25 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.100.191.150:3306/obd?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + url: jdbc:mysql://47.100.191.150:3306/obd?serverTimezone=GMT&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false username: obd password: obd2019 diff --git a/src/main/resources/generator/generatorConfig.xml b/src/main/resources/generator/generatorConfig.xml index 8039021..558fd76 100644 --- a/src/main/resources/generator/generatorConfig.xml +++ b/src/main/resources/generator/generatorConfig.xml @@ -45,8 +45,9 @@ <property name="enableSubPackages" value="true"/> </javaClientGenerator> <!-- 瑕佺敓鎴愮殑琛� tableName鏄暟鎹簱涓殑琛ㄥ悕鎴栬鍥惧悕 domainObjectName鏄疄浣撶被鍚�--> - <table tableName="obd_data" domainObjectName="ObdData" enableCountByExample="false" - enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" - selectByExampleQueryId="false"/> + <!--<table tableName="obd_data" domainObjectName="ObdData" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/>--> + <table tableName="obd_user" domainObjectName="ObdUser" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/> + <table tableName="obd_threshold_value" domainObjectName="ThresholdValue" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/> + <table tableName="obd_alarm_data" domainObjectName="AlarmData" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"/> </context> </generatorConfiguration> \ No newline at end of file diff --git a/src/main/resources/mapper/AlarmDataMapper.xml b/src/main/resources/mapper/AlarmDataMapper.xml new file mode 100644 index 0000000..ec15572 --- /dev/null +++ b/src/main/resources/mapper/AlarmDataMapper.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.flightfeather.obd.domain.mapper.AlarmDataMapper"> + <resultMap id="BaseResultMap" type="com.flightfeather.obd.domain.entity.AlarmData"> + <!-- + WARNING - @mbg.generated + --> + <id column="id" jdbcType="INTEGER" property="id" /> + <result column="obd_vin" jdbcType="VARCHAR" property="obdVin" /> + <result column="alarm_time" jdbcType="TIMESTAMP" property="alarmTime" /> + <result column="alarm_lng" jdbcType="DOUBLE" property="alarmLng" /> + <result column="alarm_lat" jdbcType="DOUBLE" property="alarmLat" /> + <result column="alarm_protocol" jdbcType="INTEGER" property="alarmProtocol" /> + <result column="alarm_mil" jdbcType="INTEGER" property="alarmMil" /> + <result column="alarm_id_code" jdbcType="VARCHAR" property="alarmIdCode" /> + <result column="alarm_verification_code" jdbcType="VARCHAR" property="alarmVerificationCode" /> + <result column="alarm_fault_code_num" jdbcType="INTEGER" property="alarmFaultCodeNum" /> + <result column="alarm_fault_code" jdbcType="VARCHAR" property="alarmFaultCode" /> + <result column="alarm_speed" jdbcType="INTEGER" property="alarmSpeed" /> + <result column="alarm_air_pressure" jdbcType="DOUBLE" property="alarmAirPressure" /> + <result column="alarm_engine_torque" jdbcType="DOUBLE" property="alarmEngineTorque" /> + <result column="alarm_friction_torque" jdbcType="DOUBLE" property="alarmFrictionTorque" /> + <result column="alarm_engine_rpm" jdbcType="INTEGER" property="alarmEngineRpm" /> + <result column="alarm_start_fuel_flow" jdbcType="DOUBLE" property="alarmStartFuelFlow" /> + <result column="alarm_scr_upstream_NO" jdbcType="DOUBLE" property="alarmScrUpstreamNo" /> + <result column="alarm_scr_downstream_NO" jdbcType="DOUBLE" property="alarmScrDownstreamNo" /> + <result column="alarm_remain_reactant" jdbcType="DOUBLE" property="alarmRemainReactant" /> + <result column="alarm_air_input" jdbcType="DOUBLE" property="alarmAirInput" /> + <result column="alarm_scr_input_temp" jdbcType="DOUBLE" property="alarmScrInputTemp" /> + <result column="alarm_scr_output_temp" jdbcType="DOUBLE" property="alarmScrOutputTemp" /> + <result column="alarm_DPF" jdbcType="DOUBLE" property="alarmDpf" /> + <result column="alarm_engine_coolant_temp" jdbcType="DOUBLE" property="alarmEngineCoolantTemp" /> + <result column="alarm_fuel_level" jdbcType="DOUBLE" property="alarmFuelLevel" /> + <result column="alarm_location_status" jdbcType="INTEGER" property="alarmLocationStatus" /> + <result column="alarm_total_mileage" jdbcType="DOUBLE" property="alarmTotalMileage" /> + <result column="alarm_engine_torque_mode" jdbcType="VARCHAR" property="alarmEngineTorqueMode" /> + <result column="alarm_accelerator_pedal" jdbcType="DOUBLE" property="alarmAcceleratorPedal" /> + <result column="alarm_total_oil_consumption" jdbcType="DOUBLE" property="alarmTotalOilConsumption" /> + <result column="alarm_urea_box_temp" jdbcType="DOUBLE" property="alarmUreaBoxTemp" /> + <result column="alarm_urea_volume" jdbcType="INTEGER" property="alarmUreaVolume" /> + <result column="alarm_total_urea_consume" jdbcType="DOUBLE" property="alarmTotalUreaConsume" /> + <result column="alarm_DPF_temp" jdbcType="DOUBLE" property="alarmDpfTemp" /> + <result column="alarm_firmware_version" jdbcType="VARCHAR" property="alarmFirmwareVersion" /> + </resultMap> + <sql id="Base_Column_List"> + <!-- + WARNING - @mbg.generated + --> + id, obd_vin, alarm_time, alarm_lng, alarm_lat, alarm_protocol, alarm_mil, alarm_id_code, + alarm_verification_code, alarm_fault_code_num, alarm_fault_code, alarm_speed, alarm_air_pressure, + alarm_engine_torque, alarm_friction_torque, alarm_engine_rpm, alarm_start_fuel_flow, + alarm_scr_upstream_NO, alarm_scr_downstream_NO, alarm_remain_reactant, alarm_air_input, + alarm_scr_input_temp, alarm_scr_output_temp, alarm_DPF, alarm_engine_coolant_temp, + alarm_fuel_level, alarm_location_status, alarm_total_mileage, alarm_engine_torque_mode, + alarm_accelerator_pedal, alarm_total_oil_consumption, alarm_urea_box_temp, alarm_urea_volume, + alarm_total_urea_consume, alarm_DPF_temp, alarm_firmware_version + </sql> +</mapper> \ No newline at end of file diff --git a/src/main/resources/mapper/ObdUserMapper.xml b/src/main/resources/mapper/ObdUserMapper.xml new file mode 100644 index 0000000..cad11ec --- /dev/null +++ b/src/main/resources/mapper/ObdUserMapper.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.flightfeather.obd.domain.mapper.ObdUserMapper"> + <resultMap id="BaseResultMap" type="com.flightfeather.obd.domain.entity.ObdUser"> + <!-- + WARNING - @mbg.generated + --> + <id column="id" jdbcType="INTEGER" property="id" /> + <result column="obd_vin" jdbcType="VARCHAR" property="obdVin" /> + <result column="obd_user_id" jdbcType="DOUBLE" property="obdUserId" /> + <result column="obd_user_name" jdbcType="VARCHAR" property="obdUserName" /> + <result column="obd_user_password" jdbcType="VARCHAR" property="obdUserPassword" /> + </resultMap> + <sql id="Base_Column_List"> + <!-- + WARNING - @mbg.generated + --> + id, obd_vin, obd_user_id, obd_user_name, obd_user_password + </sql> +</mapper> \ No newline at end of file diff --git a/src/main/resources/mapper/ThresholdValueMapper.xml b/src/main/resources/mapper/ThresholdValueMapper.xml new file mode 100644 index 0000000..1dec230 --- /dev/null +++ b/src/main/resources/mapper/ThresholdValueMapper.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.flightfeather.obd.domain.mapper.ThresholdValueMapper"> + <resultMap id="BaseResultMap" type="com.flightfeather.obd.domain.entity.ThresholdValue"> + <!-- + WARNING - @mbg.generated + --> + <id column="id" jdbcType="INTEGER" property="id" /> + <result column="obd_vin" jdbcType="VARCHAR" property="obdVin" /> + <result column="th_mil" jdbcType="INTEGER" property="thMil" /> + <result column="th_fault_code_num" jdbcType="INTEGER" property="thFaultCodeNum" /> + <result column="th_fault_code" jdbcType="VARCHAR" property="thFaultCode" /> + <result column="th_speed" jdbcType="INTEGER" property="thSpeed" /> + <result column="th_air_pressure" jdbcType="DOUBLE" property="thAirPressure" /> + <result column="th_engine_torque" jdbcType="DOUBLE" property="thEngineTorque" /> + <result column="th_friction_torque" jdbcType="DOUBLE" property="thFrictionTorque" /> + <result column="th_engine_rpm" jdbcType="INTEGER" property="thEngineRpm" /> + <result column="th_start_fuel_flow" jdbcType="DOUBLE" property="thStartFuelFlow" /> + <result column="th_scr_upstream_NO" jdbcType="DOUBLE" property="thScrUpstreamNo" /> + <result column="th_scr_downstream_NO" jdbcType="DOUBLE" property="thScrDownstreamNo" /> + <result column="th_remain_reactant" jdbcType="DOUBLE" property="thRemainReactant" /> + <result column="th_air_input" jdbcType="DOUBLE" property="thAirInput" /> + <result column="th_scr_input_temp" jdbcType="DOUBLE" property="thScrInputTemp" /> + <result column="th_scr_output_temp" jdbcType="DOUBLE" property="thScrOutputTemp" /> + <result column="th_DPF" jdbcType="DOUBLE" property="thDpf" /> + <result column="th_engine_coolant_temp" jdbcType="DOUBLE" property="thEngineCoolantTemp" /> + <result column="th_fuel_level" jdbcType="DOUBLE" property="thFuelLevel" /> + <result column="th_location_status" jdbcType="INTEGER" property="thLocationStatus" /> + <result column="th_total_mileage" jdbcType="DOUBLE" property="thTotalMileage" /> + <result column="th_engine_torque_mode" jdbcType="VARCHAR" property="thEngineTorqueMode" /> + <result column="th_accelerator_pedal" jdbcType="DOUBLE" property="thAcceleratorPedal" /> + <result column="th_total_oil_consumption" jdbcType="DOUBLE" property="thTotalOilConsumption" /> + <result column="th_urea_box_temp" jdbcType="DOUBLE" property="thUreaBoxTemp" /> + <result column="th_urea_volume" jdbcType="INTEGER" property="thUreaVolume" /> + <result column="th_total_urea_consume" jdbcType="DOUBLE" property="thTotalUreaConsume" /> + <result column="th_DPF_temp" jdbcType="DOUBLE" property="thDpfTemp" /> + </resultMap> + <sql id="Base_Column_List"> + <!-- + WARNING - @mbg.generated + --> + id, obd_vin, th_mil, th_fault_code_num, th_fault_code, th_speed, th_air_pressure, + th_engine_torque, th_friction_torque, th_engine_rpm, th_start_fuel_flow, th_scr_upstream_NO, + th_scr_downstream_NO, th_remain_reactant, th_air_input, th_scr_input_temp, th_scr_output_temp, + th_DPF, th_engine_coolant_temp, th_fuel_level, th_location_status, th_total_mileage, + th_engine_torque_mode, th_accelerator_pedal, th_total_oil_consumption, th_urea_box_temp, + th_urea_volume, th_total_urea_consume, th_DPF_temp + </sql> +</mapper> \ No newline at end of file -- Gitblit v1.9.3