From 3f2089f584b00caf2f7e57967ad1d8970b40f60c Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Wed, 16 Jul 2025 16:02:07 +0800 Subject: [PATCH] =?UTF-8?q?[1078]=20=E5=A2=9E=E5=8A=A0=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/jt1078/bean/JTAlarmSign.java | 252 +----------------- .../iot/vmp/jt1078/bean/JTStatus.java | 179 +------------ web/src/views/jtDevice/dialog/position.vue | 117 +++++--- 3 files changed, 91 insertions(+), 457 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTAlarmSign.java b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTAlarmSign.java index 04b638ced..2eeec653e 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTAlarmSign.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTAlarmSign.java @@ -1,10 +1,12 @@ package com.genersoft.iot.vmp.jt1078.bean; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; /** * 报警标志 */ +@Data @Schema(description = "报警标志") public class JTAlarmSign { @@ -112,256 +114,6 @@ public class JTAlarmSign { this.alarmIllegalDisplacement = (alarmSignInt >>> 28 & 1) == 1; this.alarmRollover = (alarmSignInt >>> 29 & 1) == 1; this.warningRollover = (alarmSignInt >>> 30 & 1) == 1; - - } - - - public boolean isUrgent() { - return urgent; - } - - public void setUrgent(boolean urgent) { - this.urgent = urgent; - } - - public boolean isAlarmSpeeding() { - return alarmSpeeding; - } - - public void setAlarmSpeeding(boolean alarmSpeeding) { - this.alarmSpeeding = alarmSpeeding; - } - - public boolean isAlarmTired() { - return alarmTired; - } - - public void setAlarmTired(boolean alarmTired) { - this.alarmTired = alarmTired; - } - - public boolean isAlarmDangerous() { - return alarmDangerous; - } - - public void setAlarmDangerous(boolean alarmDangerous) { - this.alarmDangerous = alarmDangerous; - } - - public boolean isAlarmGnssFault() { - return alarmGnssFault; - } - - public void setAlarmGnssFault(boolean alarmGnssFault) { - this.alarmGnssFault = alarmGnssFault; - } - - public boolean isAlarmGnssBreak() { - return alarmGnssBreak; - } - - public void setAlarmGnssBreak(boolean alarmGnssBreak) { - this.alarmGnssBreak = alarmGnssBreak; - } - - public boolean isAlarmGnssShortCircuited() { - return alarmGnssShortCircuited; - } - - public void setAlarmGnssShortCircuited(boolean alarmGnssShortCircuited) { - this.alarmGnssShortCircuited = alarmGnssShortCircuited; - } - - public boolean isAlarmUnderVoltage() { - return alarmUnderVoltage; - } - - public void setAlarmUnderVoltage(boolean alarmUnderVoltage) { - this.alarmUnderVoltage = alarmUnderVoltage; - } - - public boolean isAlarmPowerOff() { - return alarmPowerOff; - } - - public void setAlarmPowerOff(boolean alarmPowerOff) { - this.alarmPowerOff = alarmPowerOff; - } - - public boolean isAlarmLCD() { - return alarmLCD; - } - - public void setAlarmLCD(boolean alarmLCD) { - this.alarmLCD = alarmLCD; - } - - public boolean isAlarmTtsFault() { - return alarmTtsFault; - } - - public void setAlarmTtsFault(boolean alarmTtsFault) { - this.alarmTtsFault = alarmTtsFault; - } - - public boolean isAlarmCameraFault() { - return alarmCameraFault; - } - - public void setAlarmCameraFault(boolean alarmCameraFault) { - this.alarmCameraFault = alarmCameraFault; - } - - public boolean isAlarmIcFault() { - return alarmIcFault; - } - - public void setAlarmIcFault(boolean alarmIcFault) { - this.alarmIcFault = alarmIcFault; - } - - public boolean isWarningSpeeding() { - return warningSpeeding; - } - - public void setWarningSpeeding(boolean warningSpeeding) { - this.warningSpeeding = warningSpeeding; - } - - public boolean isWarningTired() { - return warningTired; - } - - public void setWarningTired(boolean warningTired) { - this.warningTired = warningTired; - } - - public boolean isAlarmwrong() { - return alarmwrong; - } - - public void setAlarmwrong(boolean alarmwrong) { - this.alarmwrong = alarmwrong; - } - - public boolean isWarningTirePressure() { - return warningTirePressure; - } - - public void setWarningTirePressure(boolean warningTirePressure) { - this.warningTirePressure = warningTirePressure; - } - - public boolean isAlarmBlindZone() { - return alarmBlindZone; - } - - public void setAlarmBlindZone(boolean alarmBlindZone) { - this.alarmBlindZone = alarmBlindZone; - } - - public boolean isAlarmDrivingTimeout() { - return alarmDrivingTimeout; - } - - public void setAlarmDrivingTimeout(boolean alarmDrivingTimeout) { - this.alarmDrivingTimeout = alarmDrivingTimeout; - } - - public boolean isAlarmParkingTimeout() { - return alarmParkingTimeout; - } - - public void setAlarmParkingTimeout(boolean alarmParkingTimeout) { - this.alarmParkingTimeout = alarmParkingTimeout; - } - - public boolean isAlarmRegion() { - return alarmRegion; - } - - public void setAlarmRegion(boolean alarmRegion) { - this.alarmRegion = alarmRegion; - } - - public boolean isAlarmRoute() { - return alarmRoute; - } - - public void setAlarmRoute(boolean alarmRoute) { - this.alarmRoute = alarmRoute; - } - - public boolean isAlarmTravelTime() { - return alarmTravelTime; - } - - public void setAlarmTravelTime(boolean alarmTravelTime) { - this.alarmTravelTime = alarmTravelTime; - } - - public boolean isAlarmRouteDeviation() { - return alarmRouteDeviation; - } - - public void setAlarmRouteDeviation(boolean alarmRouteDeviation) { - this.alarmRouteDeviation = alarmRouteDeviation; - } - - public boolean isAlarmVSS() { - return alarmVSS; - } - - public void setAlarmVSS(boolean alarmVSS) { - this.alarmVSS = alarmVSS; - } - - public boolean isAlarmOil() { - return alarmOil; - } - - public void setAlarmOil(boolean alarmOil) { - this.alarmOil = alarmOil; - } - - public boolean isAlarmStolen() { - return alarmStolen; - } - - public void setAlarmStolen(boolean alarmStolen) { - this.alarmStolen = alarmStolen; - } - - public boolean isAlarmIllegalIgnition() { - return alarmIllegalIgnition; - } - - public void setAlarmIllegalIgnition(boolean alarmIllegalIgnition) { - this.alarmIllegalIgnition = alarmIllegalIgnition; - } - - public boolean isAlarmIllegalDisplacement() { - return alarmIllegalDisplacement; - } - - public void setAlarmIllegalDisplacement(boolean alarmIllegalDisplacement) { - this.alarmIllegalDisplacement = alarmIllegalDisplacement; - } - - public boolean isAlarmRollover() { - return alarmRollover; - } - - public void setAlarmRollover(boolean alarmRollover) { - this.alarmRollover = alarmRollover; - } - - public boolean isWarningRollover() { - return warningRollover; - } - - public void setWarningRollover(boolean warningRollover) { - this.warningRollover = warningRollover; } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTStatus.java b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTStatus.java index 2d7cb8eb4..b8693a680 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTStatus.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTStatus.java @@ -1,7 +1,9 @@ package com.genersoft.iot.vmp.jt1078.bean; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +@Data @Schema(description = "状态信息") public class JTStatus { @@ -103,183 +105,6 @@ public class JTStatus { this.driving = (statusInt >>> 22 & 1) == 1; } - - public boolean isAcc() { - return acc; - } - - public void setAcc(boolean acc) { - this.acc = acc; - } - - public boolean isPositioning() { - return positioning; - } - - public void setPositioning(boolean positioning) { - this.positioning = positioning; - } - - public boolean isSouthLatitude() { - return southLatitude; - } - - public void setSouthLatitude(boolean southLatitude) { - this.southLatitude = southLatitude; - } - - public boolean isWesLongitude() { - return wesLongitude; - } - - public void setWesLongitude(boolean wesLongitude) { - this.wesLongitude = wesLongitude; - } - - public boolean isOutage() { - return outage; - } - - public void setOutage(boolean outage) { - this.outage = outage; - } - - public boolean isPositionEncryption() { - return positionEncryption; - } - - public void setPositionEncryption(boolean positionEncryption) { - this.positionEncryption = positionEncryption; - } - - public boolean isWarningFrontCrash() { - return warningFrontCrash; - } - - public void setWarningFrontCrash(boolean warningFrontCrash) { - this.warningFrontCrash = warningFrontCrash; - } - - public boolean isWarningShifting() { - return warningShifting; - } - - public void setWarningShifting(boolean warningShifting) { - this.warningShifting = warningShifting; - } - - public int getLoad() { - return load; - } - - public void setLoad(int load) { - this.load = load; - } - - public boolean isOilWayBreak() { - return oilWayBreak; - } - - public void setOilWayBreak(boolean oilWayBreak) { - this.oilWayBreak = oilWayBreak; - } - - public boolean isCircuitBreak() { - return circuitBreak; - } - - public void setCircuitBreak(boolean circuitBreak) { - this.circuitBreak = circuitBreak; - } - - public boolean isDoorLocking() { - return doorLocking; - } - - public void setDoorLocking(boolean doorLocking) { - this.doorLocking = doorLocking; - } - - public boolean isDoor1Open() { - return door1Open; - } - - public void setDoor1Open(boolean door1Open) { - this.door1Open = door1Open; - } - - public boolean isDoor2Open() { - return door2Open; - } - - public void setDoor2Open(boolean door2Open) { - this.door2Open = door2Open; - } - - public boolean isDoor3Open() { - return door3Open; - } - - public void setDoor3Open(boolean door3Open) { - this.door3Open = door3Open; - } - - public boolean isDoor4Open() { - return door4Open; - } - - public void setDoor4Open(boolean door4Open) { - this.door4Open = door4Open; - } - - public boolean isDoor5Open() { - return door5Open; - } - - public void setDoor5Open(boolean door5Open) { - this.door5Open = door5Open; - } - - public boolean isGps() { - return gps; - } - - public void setGps(boolean gps) { - this.gps = gps; - } - - public boolean isBeidou() { - return beidou; - } - - public void setBeidou(boolean beidou) { - this.beidou = beidou; - } - - public boolean isGlonass() { - return glonass; - } - - public void setGlonass(boolean glonass) { - this.glonass = glonass; - } - - public boolean isGaLiLeo() { - return gaLiLeo; - } - - public void setGaLiLeo(boolean gaLiLeo) { - this.gaLiLeo = gaLiLeo; - } - - public boolean isDriving() { - return driving; - } - - public void setDriving(boolean driving) { - this.driving = driving; - } - @Override public String toString() { return "状态位：" + diff --git a/web/src/views/jtDevice/dialog/position.vue b/web/src/views/jtDevice/dialog/position.vue index 658ea4302..046e06982 100755 --- a/web/src/views/jtDevice/dialog/position.vue +++ b/web/src/views/jtDevice/dialog/position.vue @@ -11,37 +11,81 @@ @close="close()" >
- - {{ attributeData.makerId }} - {{ attributeData.deviceModel }} - {{ attributeData.terminalId }} - {{ attributeData.iccId }} - {{ attributeData.hardwareVersion }} - {{ attributeData.firmwareVersion }} + + {{ positionData.longitude }} + {{ positionData.latitude }} + {{ positionData.altitude }} + {{ positionData.speed }} + {{ positionData.direction }} + {{ positionData.time }} - - {{ attributeData.type.passengerVehicles }} - {{ attributeData.type.dangerousGoodsVehicles }} - {{ attributeData.type.freightVehicles }} - {{ attributeData.type.rentalVehicles }} - {{ attributeData.type.hardDiskRecording?'支持': '不支持' }} - {{ attributeData.type.splittingMachine?'分体机': '一体机' }} - {{ attributeData.type.trailer?'是': '否' }} + + {{ positionData.alarmSign.urgent?'是': '否' }} + {{ positionData.alarmSign.alarmSpeeding?'是': '否' }} + {{ positionData.alarmSign.alarmTired?'是': '否' }} + {{ positionData.alarmSign.alarmDangerous?'是': '否' }} + {{ positionData.alarmSign.alarmGnssFault?'是': '否' }} + {{ positionData.alarmSign.alarmGnssBreak?'是': '否' }} + {{ positionData.alarmSign.alarmGnssShortCircuited?'是': '否' }} + {{ positionData.alarmSign.alarmUnderVoltage?'是': '否' }} + {{ positionData.alarmSign.alarmPowerOff?'是': '否' }} + {{ positionData.alarmSign.alarmLCD?'是': '否' }} + {{ positionData.alarmSign.alarmTtsFault?'是': '否' }} + {{ positionData.alarmSign.alarmCameraFault?'是': '否' }} + {{ positionData.alarmSign.alarmIcFault?'是': '否' }} + {{ positionData.alarmSign.warningSpeeding?'是': '否' }} + {{ positionData.alarmSign.warningTired?'是': '否' }} + {{ positionData.alarmSign.alarmwrong?'是': '否' }} + {{ positionData.alarmSign.warningTirePressure?'是': '否' }} + {{ positionData.alarmSign.alarmBlindZone?'是': '否' }} + {{ positionData.alarmSign.alarmDrivingTimeout?'是': '否' }} + {{ positionData.alarmSign.alarmParkingTimeout?'是': '否' }} + {{ positionData.alarmSign.alarmRegion?'是': '否' }} + {{ positionData.alarmSign.alarmRoute?'是': '否' }} + {{ positionData.alarmSign.alarmTravelTime?'是': '否' }} + {{ positionData.alarmSign.alarmRouteDeviation?'是': '否' }} + {{ positionData.alarmSign.alarmVSS?'是': '否' }} + {{ positionData.alarmSign.alarmOil?'是': '否' }} + {{ positionData.alarmSign.alarmStolen?'是': '否' }} + {{ positionData.alarmSign.alarmIllegalIgnition?'是': '否' }} + {{ positionData.alarmSign.alarmIllegalDisplacement?'是': '否' }} + {{ positionData.alarmSign.alarmRollover?'是': '否' }} + {{ positionData.alarmSign.warningRollover?'是': '否' }} - - {{ attributeData.gnssAttribute.gps?'支持': '不支持' }} - {{ attributeData.gnssAttribute.beidou?'支持': '不支持' }} - {{ attributeData.gnssAttribute.glonass?'支持': '不支持' }} - {{ attributeData.gnssAttribute.gaLiLeo?'支持': '不支持' }} + + {{ positionData.status.acc?'开': '关' }} + {{ positionData.status.positioning?'已定位': '未定位' }} + {{ positionData.status.southLatitude?'南纬': '北纬' }} + {{ positionData.status.wesLongitude?'西经': '东经' }} + {{ positionData.status.outage?'运营': '停运' }} + {{ positionData.status.positionEncryption?'未加密': '已加密' }} + {{ positionData.status.warningFrontCrash?'是': '否' }} + {{ positionData.status.warningShifting?'是': '否' }} + {{ getLoadStatus(positionData.status.load)}} + {{ positionData.status.oilWayBreak?'正常': '断开' }} + {{ positionData.status.circuitBreak?'正常': '断开' }} + {{ positionData.status.doorLocking?'加锁': '解锁' }} + {{ positionData.status.door1Open?'关': '开' }} + {{ positionData.status.door2Open?'关': '开' }} + {{ positionData.status.door3Open?'关': '开' }} + {{ positionData.status.door4Open?'关': '开' }} + {{ positionData.status.door5Open?'关': '开' }} + {{ positionData.status.gps?'使用': '未使用' }} + {{ positionData.status.beidou?'使用': '未使用' }} + {{ positionData.status.glonass?'使用': '未使用' }} + {{ positionData.status.gaLiLeo?'使用': '未使用' }} + {{ positionData.status.driving?'行使': '停止' }} - - {{ attributeData.communicationModuleAttribute.gprs?'支持': '不支持' }} - {{ attributeData.communicationModuleAttribute.cdma?'支持': '不支持' }} - {{ attributeData.communicationModuleAttribute.tdScdma?'支持': '不支持' }} - {{ attributeData.communicationModuleAttribute.wcdma?'支持': '不支持' }} - {{ attributeData.communicationModuleAttribute.cdma2000?'支持': '不支持' }} - {{ attributeData.communicationModuleAttribute.tdLte?'支持': '不支持' }} - {{ attributeData.communicationModuleAttribute.other?'支持': '不支持' }} + + {{ positionData.videoAlarm.videoLossChannels?positionData.videoAlarm.videoLossChannels.join(','): '无' }} + {{ positionData.videoAlarm.videoOcclusionChannels?positionData.videoAlarm.videoOcclusionChannels.join(','): '无' }} + {{ positionData.videoAlarm.storageFaultAlarm?positionData.videoAlarm.storageFaultAlarm.join(','): '无' }} + {{ positionData.videoAlarm.drivingForFatigue?'是': '否' }} + {{ positionData.videoAlarm.drivingForCall?'是': '否' }} + {{ positionData.videoAlarm.drivingSmoking?'是': '否' }} + {{ positionData.videoAlarm.otherDeviceFailure?'是': '否' }} + {{ positionData.videoAlarm.overcrowding?'是': '否' }} + {{ positionData.videoAlarm.specialRecordFull?'是': '否' }}
@@ -59,7 +103,7 @@ export default { data() { return { showDialog: false, - attributeData: null + positionData: null } }, computed: {}, @@ -67,8 +111,21 @@ export default { methods: { openDialog: function(data) { this.showDialog = true - this.attributeData = data + this.positionData = data }, + getLoadStatus: function(load) { + switch (load) { + case 0: + return '空车' + case 1: + return '半载' + case 2: + return '保留' + case 3: + return '满载' + } + }, + close: function() { this.showDialog = false }