aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-26 23:17:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[1078] 合并新UI

Browse Source
This commit is contained in:
lin 2025-05-15 18:32:03 +08:00
parent 5b89145337
commit 592c1c2b71
14 changed files with 1491 additions and 1139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

718
src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java
View File

@ -3,11 +3,13 @@ package com.genersoft.iot.vmp.jt1078.bean;
import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute; import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute;
import com.genersoft.iot.vmp.jt1078.bean.config.*; import com.genersoft.iot.vmp.jt1078.bean.config.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/** /**
* JT 终端参数设置 * JT 终端参数设置
*/ */
@Schema(description = "JT终端参数设置") @Schema(description = "JT终端参数设置")
@Data
public class JTDeviceConfig { public class JTDeviceConfig {
@ConfigAttribute(id = 0x1, type="Long", description = "终端心跳发送间隔,单位为秒(s)") @ConfigAttribute(id = 0x1, type="Long", description = "终端心跳发送间隔,单位为秒(s)")
@ -247,7 +249,7 @@ public class JTDeviceConfig {
@ConfigAttribute(id = 0x84, type="Short", description = "车牌颜色,值按照JT/T697-7.2014中的规定,未上牌车辆填0") @ConfigAttribute(id = 0x84, type="Short", description = "车牌颜色,值按照JT/T697-7.2014中的规定,未上牌车辆填0")
private Short licensePlateColor; private Short licensePlateColor;
@ConfigAttribute(id = 0x90, type="Short", description = "GNSS定位模式") @ConfigAttribute(id = 0x90, type="GnssPositioningMode", description = "GNSS定位模式")
private JTGnssPositioningMode gnssPositioningMode; private JTGnssPositioningMode gnssPositioningMode;
@ConfigAttribute(id = 0x91, type="Short", description = "GNSS 波特率,定义如下: 0: 4800, 1:9600, 2：19200, 3:38400, 4:57600, 5:115200") @ConfigAttribute(id = 0x91, type="Short", description = "GNSS 波特率,定义如下: 0: 4800, 1:9600, 2：19200, 3:38400, 4:57600, 5:115200")
@ -288,720 +290,6 @@ public class JTDeviceConfig {
@ConfigAttribute(id = 0x103, type="Integer", description = "CAN总线通道2 上传时间间隔 ,单位为秒(s) ,0 表示不上传") @ConfigAttribute(id = 0x103, type="Integer", description = "CAN总线通道2 上传时间间隔 ,单位为秒(s) ,0 表示不上传")
private Integer canUploadIntervalForChannel2; private Integer canUploadIntervalForChannel2;
public JTAnalyzeAlarmParam getAnalyzeAlarmParam() {
return analyzeAlarmParam;
}
public void setAnalyzeAlarmParam(JTAnalyzeAlarmParam analyzeAlarmParam) {
this.analyzeAlarmParam = analyzeAlarmParam;
}
public Long getKeepaliveInterval() {
return keepaliveInterval;
}
public void setKeepaliveInterval(Long keepaliveInterval) {
this.keepaliveInterval = keepaliveInterval;
}
public Long getTcpResponseTimeout() {
return tcpResponseTimeout;
}
public void setTcpResponseTimeout(Long tcpResponseTimeout) {
this.tcpResponseTimeout = tcpResponseTimeout;
}
public Long getTcpRetransmissionCount() {
return tcpRetransmissionCount;
}
public void setTcpRetransmissionCount(Long tcpRetransmissionCount) {
this.tcpRetransmissionCount = tcpRetransmissionCount;
}
public Long getUdpResponseTimeout() {
return udpResponseTimeout;
}
public void setUdpResponseTimeout(Long udpResponseTimeout) {
this.udpResponseTimeout = udpResponseTimeout;
}
public Long getUdpRetransmissionCount() {
return udpRetransmissionCount;
}
public void setUdpRetransmissionCount(Long udpRetransmissionCount) {
this.udpRetransmissionCount = udpRetransmissionCount;
}
public Long getSmsResponseTimeout() {
return smsResponseTimeout;
}
public void setSmsResponseTimeout(Long smsResponseTimeout) {
this.smsResponseTimeout = smsResponseTimeout;
}
public Long getSmsRetransmissionCount() {
return smsRetransmissionCount;
}
public void setSmsRetransmissionCount(Long smsRetransmissionCount) {
this.smsRetransmissionCount = smsRetransmissionCount;
}
public String getApnMaster() {
return apnMaster;
}
public void setApnMaster(String apnMaster) {
this.apnMaster = apnMaster;
}
public String getDialingUsernameMaster() {
return dialingUsernameMaster;
}
public void setDialingUsernameMaster(String dialingUsernameMaster) {
this.dialingUsernameMaster = dialingUsernameMaster;
}
public String getDialingPasswordMaster() {
return dialingPasswordMaster;
}
public void setDialingPasswordMaster(String dialingPasswordMaster) {
this.dialingPasswordMaster = dialingPasswordMaster;
}
public String getAddressMaster() {
return addressMaster;
}
public void setAddressMaster(String addressMaster) {
this.addressMaster = addressMaster;
}
public String getApnBackup() {
return apnBackup;
}
public void setApnBackup(String apnBackup) {
this.apnBackup = apnBackup;
}
public String getDialingUsernameBackup() {
return dialingUsernameBackup;
}
public void setDialingUsernameBackup(String dialingUsernameBackup) {
this.dialingUsernameBackup = dialingUsernameBackup;
}
public String getDialingPasswordBackup() {
return dialingPasswordBackup;
}
public void setDialingPasswordBackup(String dialingPasswordBackup) {
this.dialingPasswordBackup = dialingPasswordBackup;
}
public String getAddressBackup() {
return addressBackup;
}
public void setAddressBackup(String addressBackup) {
this.addressBackup = addressBackup;
}
public String getAddressIcMaster() {
return addressIcMaster;
}
public void setAddressIcMaster(String addressIcMaster) {
this.addressIcMaster = addressIcMaster;
}
public Long getTcpPortIcMaster() {
return tcpPortIcMaster;
}
public void setTcpPortIcMaster(Long tcpPortIcMaster) {
this.tcpPortIcMaster = tcpPortIcMaster;
}
public Long getUdpPortIcMaster() {
return udpPortIcMaster;
}
public void setUdpPortIcMaster(Long udpPortIcMaster) {
this.udpPortIcMaster = udpPortIcMaster;
}
public String getAddressIcBackup() {
return addressIcBackup;
}
public void setAddressIcBackup(String addressIcBackup) {
this.addressIcBackup = addressIcBackup;
}
public Long getLocationReportingStrategy() {
return locationReportingStrategy;
}
public void setLocationReportingStrategy(Long locationReportingStrategy) {
this.locationReportingStrategy = locationReportingStrategy;
}
public Long getLocationReportingPlan() {
return locationReportingPlan;
}
public void setLocationReportingPlan(Long locationReportingPlan) {
this.locationReportingPlan = locationReportingPlan;
}
public Long getReportingIntervalOffline() {
return reportingIntervalOffline;
}
public void setReportingIntervalOffline(Long reportingIntervalOffline) {
this.reportingIntervalOffline = reportingIntervalOffline;
}
public String getApnSlave() {
return apnSlave;
}
public void setApnSlave(String apnSlave) {
this.apnSlave = apnSlave;
}
public String getDialingUsernameSlave() {
return dialingUsernameSlave;
}
public void setDialingUsernameSlave(String dialingUsernameSlave) {
this.dialingUsernameSlave = dialingUsernameSlave;
}
public String getDialingPasswordSlave() {
return dialingPasswordSlave;
}
public void setDialingPasswordSlave(String dialingPasswordSlave) {
this.dialingPasswordSlave = dialingPasswordSlave;
}
public String getAddressSlave() {
return addressSlave;
}
public void setAddressSlave(String addressSlave) {
this.addressSlave = addressSlave;
}
public Long getReportingIntervalDormancy() {
return reportingIntervalDormancy;
}
public void setReportingIntervalDormancy(Long reportingIntervalDormancy) {
this.reportingIntervalDormancy = reportingIntervalDormancy;
}
public Long getReportingIntervalEmergencyAlarm() {
return reportingIntervalEmergencyAlarm;
}
public void setReportingIntervalEmergencyAlarm(Long reportingIntervalEmergencyAlarm) {
this.reportingIntervalEmergencyAlarm = reportingIntervalEmergencyAlarm;
}
public Long getReportingIntervalDefault() {
return reportingIntervalDefault;
}
public void setReportingIntervalDefault(Long reportingIntervalDefault) {
this.reportingIntervalDefault = reportingIntervalDefault;
}
public Long getReportingDistanceDefault() {
return reportingDistanceDefault;
}
public void setReportingDistanceDefault(Long reportingDistanceDefault) {
this.reportingDistanceDefault = reportingDistanceDefault;
}
public Long getReportingDistanceOffline() {
return reportingDistanceOffline;
}
public void setReportingDistanceOffline(Long reportingDistanceOffline) {
this.reportingDistanceOffline = reportingDistanceOffline;
}
public Long getReportingDistanceDormancy() {
return reportingDistanceDormancy;
}
public void setReportingDistanceDormancy(Long reportingDistanceDormancy) {
this.reportingDistanceDormancy = reportingDistanceDormancy;
}
public Long getReportingDistanceEmergencyAlarm() {
return reportingDistanceEmergencyAlarm;
}
public void setReportingDistanceEmergencyAlarm(Long reportingDistanceEmergencyAlarm) {
this.reportingDistanceEmergencyAlarm = reportingDistanceEmergencyAlarm;
}
public Long getInflectionPointAngle() {
return inflectionPointAngle;
}
public void setInflectionPointAngle(Long inflectionPointAngle) {
this.inflectionPointAngle = inflectionPointAngle;
}
public Integer getFenceRadius() {
return fenceRadius;
}
public void setFenceRadius(Integer fenceRadius) {
this.fenceRadius = fenceRadius;
}
public JTIllegalDrivingPeriods getIllegalDrivingPeriods() {
return illegalDrivingPeriods;
}
public void setIllegalDrivingPeriods(JTIllegalDrivingPeriods illegalDrivingPeriods) {
this.illegalDrivingPeriods = illegalDrivingPeriods;
}
public String getPlatformPhoneNumber() {
return platformPhoneNumber;
}
public void setPlatformPhoneNumber(String platformPhoneNumber) {
this.platformPhoneNumber = platformPhoneNumber;
}
public String getPhoneNumberForReset() {
return phoneNumberForReset;
}
public void setPhoneNumberForReset(String phoneNumberForReset) {
this.phoneNumberForReset = phoneNumberForReset;
}
public String getPhoneNumberForFactoryReset() {
return phoneNumberForFactoryReset;
}
public void setPhoneNumberForFactoryReset(String phoneNumberForFactoryReset) {
this.phoneNumberForFactoryReset = phoneNumberForFactoryReset;
}
public String getPhoneNumberForSms() {
return phoneNumberForSms;
}
public void setPhoneNumberForSms(String phoneNumberForSms) {
this.phoneNumberForSms = phoneNumberForSms;
}
public String getPhoneNumberForReceiveTextAlarm() {
return phoneNumberForReceiveTextAlarm;
}
public void setPhoneNumberForReceiveTextAlarm(String phoneNumberForReceiveTextAlarm) {
this.phoneNumberForReceiveTextAlarm = phoneNumberForReceiveTextAlarm;
}
public Long getPhoneAnsweringPolicy() {
return phoneAnsweringPolicy;
}
public void setPhoneAnsweringPolicy(Long phoneAnsweringPolicy) {
this.phoneAnsweringPolicy = phoneAnsweringPolicy;
}
public Long getLongestCallTimeForPerSession() {
return longestCallTimeForPerSession;
}
public void setLongestCallTimeForPerSession(Long longestCallTimeForPerSession) {
this.longestCallTimeForPerSession = longestCallTimeForPerSession;
}
public Long getLongestCallTimeInMonth() {
return longestCallTimeInMonth;
}
public void setLongestCallTimeInMonth(Long longestCallTimeInMonth) {
this.longestCallTimeInMonth = longestCallTimeInMonth;
}
public String getPhoneNumbersForListen() {
return phoneNumbersForListen;
}
public void setPhoneNumbersForListen(String phoneNumbersForListen) {
this.phoneNumbersForListen = phoneNumbersForListen;
}
public String getPrivilegedSMSNumber() {
return privilegedSMSNumber;
}
public void setPrivilegedSMSNumber(String privilegedSMSNumber) {
this.privilegedSMSNumber = privilegedSMSNumber;
}
public Long getAlarmMaskingWord() {
return alarmMaskingWord;
}
public void setAlarmMaskingWord(Long alarmMaskingWord) {
this.alarmMaskingWord = alarmMaskingWord;
}
public Long getAlarmSendsTextSmsSwitch() {
return alarmSendsTextSmsSwitch;
}
public void setAlarmSendsTextSmsSwitch(Long alarmSendsTextSmsSwitch) {
this.alarmSendsTextSmsSwitch = alarmSendsTextSmsSwitch;
}
public Long getAlarmShootingSwitch() {
return alarmShootingSwitch;
}
public void setAlarmShootingSwitch(Long alarmShootingSwitch) {
this.alarmShootingSwitch = alarmShootingSwitch;
}
public Long getAlarmShootingStorageFlags() {
return alarmShootingStorageFlags;
}
public void setAlarmShootingStorageFlags(Long alarmShootingStorageFlags) {
this.alarmShootingStorageFlags = alarmShootingStorageFlags;
}
public Long getKeySign() {
return KeySign;
}
public void setKeySign(Long keySign) {
KeySign = keySign;
}
public Long getMaxSpeed() {
return maxSpeed;
}
public void setMaxSpeed(Long maxSpeed) {
this.maxSpeed = maxSpeed;
}
public Long getOverSpeedDuration() {
return overSpeedDuration;
}
public void setOverSpeedDuration(Long overSpeedDuration) {
this.overSpeedDuration = overSpeedDuration;
}
public Long getContinuousDrivingTimeThreshold() {
return continuousDrivingTimeThreshold;
}
public void setContinuousDrivingTimeThreshold(Long continuousDrivingTimeThreshold) {
this.continuousDrivingTimeThreshold = continuousDrivingTimeThreshold;
}
public Long getCumulativeDrivingTimeThresholdForTheDay() {
return cumulativeDrivingTimeThresholdForTheDay;
}
public void setCumulativeDrivingTimeThresholdForTheDay(Long cumulativeDrivingTimeThresholdForTheDay) {
this.cumulativeDrivingTimeThresholdForTheDay = cumulativeDrivingTimeThresholdForTheDay;
}
public Long getMinimumBreakTime() {
return minimumBreakTime;
}
public void setMinimumBreakTime(Long minimumBreakTime) {
this.minimumBreakTime = minimumBreakTime;
}
public Long getMaximumParkingTime() {
return maximumParkingTime;
}
public void setMaximumParkingTime(Long maximumParkingTime) {
this.maximumParkingTime = maximumParkingTime;
}
public Integer getOverSpeedWarningDifference() {
return overSpeedWarningDifference;
}
public void setOverSpeedWarningDifference(Integer overSpeedWarningDifference) {
this.overSpeedWarningDifference = overSpeedWarningDifference;
}
public Integer getDrowsyDrivingWarningDifference() {
return drowsyDrivingWarningDifference;
}
public void setDrowsyDrivingWarningDifference(Integer drowsyDrivingWarningDifference) {
this.drowsyDrivingWarningDifference = drowsyDrivingWarningDifference;
}
public JTCollisionAlarmParams getCollisionAlarmParams() {
return collisionAlarmParams;
}
public void setCollisionAlarmParams(JTCollisionAlarmParams collisionAlarmParams) {
this.collisionAlarmParams = collisionAlarmParams;
}
public Integer getRolloverAlarm() {
return rolloverAlarm;
}
public void setRolloverAlarm(Integer rolloverAlarm) {
this.rolloverAlarm = rolloverAlarm;
}
public JTCameraTimer getCameraTimer() {
return cameraTimer;
}
public void setCameraTimer(JTCameraTimer cameraTimer) {
this.cameraTimer = cameraTimer;
}
public Long getQualityForVideo() {
return qualityForVideo;
}
public void setQualityForVideo(Long qualityForVideo) {
this.qualityForVideo = qualityForVideo;
}
public Long getBrightness() {
return brightness;
}
public void setBrightness(Long brightness) {
this.brightness = brightness;
}
public Long getContrastRatio() {
return contrastRatio;
}
public void setContrastRatio(Long contrastRatio) {
this.contrastRatio = contrastRatio;
}
public Long getSaturation() {
return saturation;
}
public void setSaturation(Long saturation) {
this.saturation = saturation;
}
public Long getChroma() {
return chroma;
}
public void setChroma(Long chroma) {
this.chroma = chroma;
}
public Long getMileage() {
return mileage;
}
public void setMileage(Long mileage) {
this.mileage = mileage;
}
public Integer getProvincialId() {
return provincialId;
}
public void setProvincialId(Integer provincialId) {
this.provincialId = provincialId;
}
public Integer getCityId() {
return cityId;
}
public void setCityId(Integer cityId) {
this.cityId = cityId;
}
public String getLicensePlate() {
return licensePlate;
}
public void setLicensePlate(String licensePlate) {
this.licensePlate = licensePlate;
}
public Short getLicensePlateColor() {
return licensePlateColor;
}
public void setLicensePlateColor(Short licensePlateColor) {
this.licensePlateColor = licensePlateColor;
}
public JTGnssPositioningMode getGnssPositioningMode() {
return gnssPositioningMode;
}
public void setGnssPositioningMode(JTGnssPositioningMode gnssPositioningMode) {
this.gnssPositioningMode = gnssPositioningMode;
}
public Short getGnssBaudRate() {
return gnssBaudRate;
}
public void setGnssBaudRate(Short gnssBaudRate) {
this.gnssBaudRate = gnssBaudRate;
}
public Short getGnssOutputFrequency() {
return gnssOutputFrequency;
}
public void setGnssOutputFrequency(Short gnssOutputFrequency) {
this.gnssOutputFrequency = gnssOutputFrequency;
}
public Long getGnssCollectionFrequency() {
return gnssCollectionFrequency;
}
public void setGnssCollectionFrequency(Long gnssCollectionFrequency) {
this.gnssCollectionFrequency = gnssCollectionFrequency;
}
public Short getGnssDataUploadMethod() {
return gnssDataUploadMethod;
}
public void setGnssDataUploadMethod(Short gnssDataUploadMethod) {
this.gnssDataUploadMethod = gnssDataUploadMethod;
}
public Long getGnssDataUploadMethodUnit() {
return gnssDataUploadMethodUnit;
}
public void setGnssDataUploadMethodUnit(Long gnssDataUploadMethodUnit) {
this.gnssDataUploadMethodUnit = gnssDataUploadMethodUnit;
}
public Long getCanCollectionTimeForChannel1() {
return canCollectionTimeForChannel1;
}
public void setCanCollectionTimeForChannel1(Long canCollectionTimeForChannel1) {
this.canCollectionTimeForChannel1 = canCollectionTimeForChannel1;
}
public Integer getCanUploadIntervalForChannel1() {
return canUploadIntervalForChannel1;
}
public void setCanUploadIntervalForChannel1(Integer canUploadIntervalForChannel1) {
this.canUploadIntervalForChannel1 = canUploadIntervalForChannel1;
}
public Long getCanCollectionTimeForChannel2() {
return canCollectionTimeForChannel2;
}
public void setCanCollectionTimeForChannel2(Long canCollectionTimeForChannel2) {
this.canCollectionTimeForChannel2 = canCollectionTimeForChannel2;
}
public Integer getCanUploadIntervalForChannel2() {
return canUploadIntervalForChannel2;
}
public void setCanUploadIntervalForChannel2(Integer canUploadIntervalForChannel2) {
this.canUploadIntervalForChannel2 = canUploadIntervalForChannel2;
}
public JTVideoParam getVideoParam() {
return videoParam;
}
public void setVideoParam(JTVideoParam videoParam) {
this.videoParam = videoParam;
}
public JTChannelListParam getChannelListParam() {
return channelListParam;
}
public void setChannelListParam(JTChannelListParam channelListParam) {
this.channelListParam = channelListParam;
}
public JTChannelParam getChannelParam() {
return channelParam;
}
public void setChannelParam(JTChannelParam channelParam) {
this.channelParam = channelParam;
}
public JTAlarmRecordingParam getAlarmRecordingParam() {
return alarmRecordingParam;
}
public void setAlarmRecordingParam(JTAlarmRecordingParam alarmRecordingParam) {
this.alarmRecordingParam = alarmRecordingParam;
}
public JTVideoAlarmBit getVideoAlarmBit() {
return videoAlarmBit;
}
public void setVideoAlarmBit(JTVideoAlarmBit videoAlarmBit) {
this.videoAlarmBit = videoAlarmBit;
}
public JTAwakenParam getAwakenParam() {
return awakenParam;
}
public void setAwakenParam(JTAwakenParam awakenParam) {
this.awakenParam = awakenParam;
}
@Override @Override
public String toString() { public String toString() {
return "JTDeviceConfig{" + return "JTDeviceConfig{" +

2
src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
View File

@ -40,7 +40,7 @@ public class Jt808Decoder extends ByteToMessageDecoder {
@Override @Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception { protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
Session session = ctx.channel().attr(Session.KEY).get(); Session session = ctx.channel().attr(Session.KEY).get();
log.info("> {} hex:{}", session, ByteBufUtil.hexDump(in)); log.debug("> {} hex:{}", session, ByteBufUtil.hexDump(in));
try { try {
ByteBuf buf = unEscapeAndCheck(in); ByteBuf buf = unEscapeAndCheck(in);

2
src/main/java/com/genersoft/iot/vmp/jt1078/codec/encode/Jt808Encoder.java
View File

@ -26,7 +26,7 @@ public class Jt808Encoder extends MessageToByteEncoder<Rs> {
List<ByteBuf> encodeList = Jt808EncoderCmd.encode(msg, session, session.nextSerialNo()); List<ByteBuf> encodeList = Jt808EncoderCmd.encode(msg, session, session.nextSerialNo());
if(encodeList!=null && !encodeList.isEmpty()){ if(encodeList!=null && !encodeList.isEmpty()){
for (ByteBuf byteBuf : encodeList) { for (ByteBuf byteBuf : encodeList) {
log.info("< {} hex:{}", session, ByteBufUtil.hexDump(byteBuf)); log.debug("< {} hex:{}", session, ByteBufUtil.hexDump(byteBuf));
out.writeBytes(byteBuf); out.writeBytes(byteBuf);
} }
} }

2
src/main/java/com/genersoft/iot/vmp/jt1078/codec/encode/Jt808EncoderCmd.java
View File

@ -34,7 +34,7 @@ public class Jt808EncoderCmd extends MessageToByteEncoder<Cmd> {
List<ByteBuf> encodeList = encode(msg, session, cmd.getPackageNo().intValue()); List<ByteBuf> encodeList = encode(msg, session, cmd.getPackageNo().intValue());
if (encodeList != null && !encodeList.isEmpty()) { if (encodeList != null && !encodeList.isEmpty()) {
for (ByteBuf byteBuf : encodeList) { for (ByteBuf byteBuf : encodeList) {
log.info("< {} hex:{}", session, ByteBufUtil.hexDump(byteBuf)); log.debug("< {} hex:{}", session, ByteBufUtil.hexDump(byteBuf));
out.writeBytes(byteBuf); out.writeBytes(byteBuf);
} }
} }

1
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0104.java
View File

@ -131,6 +131,7 @@ public class J0104 extends Re {
JTChannelListParam channelListParam = JTChannelListParam.decode(buf); JTChannelListParam channelListParam = JTChannelListParam.decode(buf);
Method methodForChannelListParam = deviceConfig.getClass().getDeclaredMethod("set" + StringUtils.capitalize(field.getName()), JTChannelListParam.class); Method methodForChannelListParam = deviceConfig.getClass().getDeclaredMethod("set" + StringUtils.capitalize(field.getName()), JTChannelListParam.class);
methodForChannelListParam.invoke(deviceConfig, channelListParam); methodForChannelListParam.invoke(deviceConfig, channelListParam);
continue;
case "ChannelParam": case "ChannelParam":
JTChannelParam channelParam = JTChannelParam.decode(buf); JTChannelParam channelParam = JTChannelParam.decode(buf);
Method methodForChannelParam = deviceConfig.getClass().getDeclaredMethod("set" + StringUtils.capitalize(field.getName()), JTChannelParam.class); Method methodForChannelParam = deviceConfig.getClass().getDeclaredMethod("set" + StringUtils.capitalize(field.getName()), JTChannelParam.class);

4
src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java
View File

@ -240,8 +240,8 @@ public class jt1078PlayServiceImpl implements Ijt1078PlayService {
dynamicTask.startDelay(playKey, () -> { dynamicTask.startDelay(playKey, () -> {
log.info("[1078-点播] 超时， phoneNumber： {}， channelId： {}", phoneNumber, channelId); log.info("[1078-点播] 超时， phoneNumber： {}， channelId： {}", phoneNumber, channelId);
for (CommonCallback<WVPResult<StreamInfo>> errorCallback : errorCallbacks) { for (CommonCallback<WVPResult<StreamInfo>> errorCallback : errorCallbacks) {
errorCallback.run(new WVPResult<>(InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getCode(), errorCallback.run(new WVPResult<>(InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getCode(),
InviteErrorCode.ERROR_FOR_SIGNALLING_TIMEOUT.getMsg(), null)); InviteErrorCode.ERROR_FOR_STREAM_TIMEOUT.getMsg(), null));
} }
mediaServerService.closeRTPServer(mediaServer, stream); mediaServerService.closeRTPServer(mediaServer, stream);
subscribe.removeSubscribe(hook); subscribe.removeSubscribe(hook);

73
web/src/api/jtDevice.js
View File

@ -139,4 +139,77 @@ export function fillLight(params) {
} }
}) })
} }
export function queryRecordList(params) {
const { phoneNumber, channelId, startTime, endTime } = params
return request({
method: 'get',
url: '/api/jt1078/record/list',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
startTime: startTime,
endTime: endTime
}
})
}
export function startPlayback(params) {
const { phoneNumber, channelId, startTime, endTime, type, rate, playbackType, playbackSpeed } = params
return request({
method: 'get',
url: '/api/jt1078/playback/start/',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
startTime: startTime,
endTime: endTime,
type: type,
rate: rate,
playbackType: playbackType,
playbackSpeed: playbackSpeed
}
})
}
export function controlPlayback(params) {
const { phoneNumber, channelId, command, playbackSpeed, time } = params
return request({
method: 'get',
url: '/api/jt1078/playback/control',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
command: command,
playbackSpeed: playbackSpeed,
time: time
}
})
}
export function stopPlayback(params) {
const { phoneNumber, channelId, streamId } = params
return request({
method: 'get',
url: '/api/jt1078/playback/stop/',
params: {
phoneNumber: phoneNumber,
channelId: channelId,
streamId: streamId
}
})
}
export function queryConfig(phoneNumber) {
return request({
method: 'get',
url: `/api/jt1078/config`,
params: {
phoneNumber: phoneNumber
}
})
}
export function setConfig(data) {
return request({
method: 'post',
url: `/api/jt1078/set-config`,
data: data
})
}

70
web/src/store/modules/jtDevice.js
View File

@ -1,12 +1,12 @@
import { import {
add, add,
addChannel, deleteDevice, addChannel, controlPlayback, deleteDevice,
deleteDeviceById, fillLight, fillLight,
play, ptz, play, ptz,
queryChannels, queryChannels, queryConfig,
queryDeviceById, queryDeviceById,
queryDevices, queryDevices, queryRecordList, setConfig, startPlayback,
stopPlay, update, stopPlay, stopPlayback, update,
updateChannel, wiper updateChannel, wiper
} from '@/api/jtDevice' } from '@/api/jtDevice'
@ -140,6 +140,66 @@ const actions = {
reject(error) reject(error)
}) })
}) })
},
queryConfig({ commit }, phoneNumber) {
return new Promise((resolve, reject) => {
queryConfig(phoneNumber).then(response => {
const { data } = response
resolve(data)
}).catch(error => {
reject(error)
})
})
},
setConfig({ commit }, data) {
return new Promise((resolve, reject) => {
setConfig(data).then(response => {
const { data } = response
resolve(data)
}).catch(error => {
reject(error)
})
})
},
queryRecordList({ commit }, params) {
return new Promise((resolve, reject) => {
queryRecordList(params).then(response => {
const { data } = response
resolve(data)
}).catch(error => {
reject(error)
})
})
},
startPlayback({ commit }, params) {
return new Promise((resolve, reject) => {
startPlayback(params).then(response => {
const { data } = response
resolve(data)
}).catch(error => {
reject(error)
})
})
},
controlPlayback({ commit }, params) {
return new Promise((resolve, reject) => {
controlPlayback(params).then(response => {
const { data } = response
resolve(data)
}).catch(error => {
reject(error)
})
})
},
stopPlayback({ commit }, params) {
return new Promise((resolve, reject) => {
stopPlayback(params).then(response => {
const { data } = response
resolve(data)
}).catch(error => {
reject(error)
})
})
} }
} }

2
web/src/views/jtDevice/channel/index.vue
View File

@ -250,7 +250,7 @@ export default {
queryCloudRecords: function(itemData) { queryCloudRecords: function(itemData) {
const deviceId = this.device.phoneNumber const deviceId = this.device.phoneNumber
const channelId = itemData.channelId const channelId = itemData.channelId
this.$router.push(`/cloudRecord/detail/rtp/${deviceId}_${channelId}`) this.$router.push(`/cloudRecord/detail/rtp/jt_${deviceId}_${channelId}`)
}, },
stopDevicePush: function(itemData) { stopDevicePush: function(itemData) {
this.$store.dispatch('jtDevice/stopPlay', { this.$store.dispatch('jtDevice/stopPlay', {

867
web/src/views/jtDevice/channel/record.vue
View File

@ -1,73 +1,167 @@
<template> <template>
<div style="width: 100%"> <div id="DeviceRecord" class="app-container">
<div class="page-header"> <div :style="boxStyle">
<div class="page-title"> <div>
<el-page-header content="部标录像" @back="goBack" />
</div>
</div>
<el-container>
<el-aside width="300px">
<div class="record-list-box-box"> <div class="record-list-box-box">
<el-date-picker v-model="chooseDate" size="mini" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()" /> <div v-if="showSidebar">
<div v-loading="recordsLoading" class="record-list-box" :style="recordListStyle"> <el-date-picker
v-model="chooseDate"
size="mini"
:picker-options="pickerOptions"
type="date"
value-format="yyyy-MM-dd"
placeholder="日期"
style="width: 190px"
@change="dateChange()"
/>
<!-- <el-button :disabled="!mediaServerId" size="mini" type="primary" icon="fa fa-cloud-download" style="margin: auto; margin-left: 12px " title="裁剪合并" @click="drawerOpen"></el-button>-->
</div>
<div class="record-list-box" style="height: calc(100vh - 170px); overflow: auto">
<ul v-if="detailFiles.length >0" class="infinite-list record-list"> <ul v-if="detailFiles.length >0" class="infinite-list record-list">
<li v-for="item in detailFiles" class="infinite-list-item record-list-item"> <li v-for="(item,index) in detailFiles" :key="index" class="infinite-list-item record-list-item">
<el-tag
<el-tag v-if="chooseFile !== item" @click="checkedFile(item)"> v-if="chooseFileIndex !== index"
style="background-color: #ecf5ff; color: #017690; "
@click="chooseFile(index)"
>
<i class="el-icon-video-camera" /> <i class="el-icon-video-camera" />
{{ moment(item.startTime).format('HH:mm:ss') }}-{{ moment(item.endTime).format('HH:mm:ss') }} {{ getFileShowName(item) }}
</el-tag> </el-tag>
<el-tag v-if="chooseFile === item" type="danger"> <el-tag v-if="chooseFileIndex === index" type="danger">
<i class="el-icon-video-camera" /> <i class="el-icon-video-camera" />
{{ moment(item.startTime).format('HH:mm:ss') }}-{{ moment(item.endTime).format('HH:mm:ss') }} {{ getFileShowName(item) }}
</el-tag> </el-tag>
<i style="color: #409EFF;margin-left: 5px;" class="el-icon-download" @click="downloadRecord(item)" /> <a
class="el-icon-download"
style="color: #409EFF;font-weight: 600;margin-left: 10px;"
target="_blank"
@click="downloadFile(item)"
/>
</li> </li>
</ul> </ul>
<div v-if="detailFiles.length === 0" class="record-list-no-val">暂无数据</div>
</div> </div>
<div v-if="detailFiles.length ==0" size="mini" class="record-list-no-val">暂无数据</div>
</div> </div>
</div>
</el-aside> <div id="playerBox">
<el-main style="padding-bottom: 10px;"> <div class="playBox" style="height: calc(100% - 90px); width: 100%; background-color: #000000">
<div class="playBox" :style="playerStyle"> <div
<player v-if="playLoading"
style="position: relative; left: calc(50% - 32px); top: 43%; z-index: 100;color: #fff;float: left; text-align: center;"
>
<div class="el-icon-loading" />
<div style="width: 100%; line-height: 2rem">正在加载</div>
</div>
<h265web
ref="recordVideoPlayer" ref="recordVideoPlayer"
:video-url="videoUrl" :video-url="videoUrl"
:error="videoError" :height="'calc(100vh - 250px)'"
:message="videoError" :show-button="false"
:has-audio="hasAudio" :has-audio="true"
style="max-height: 100%" @playStatusChange="playingChange"
fluent @playTimeChange="showPlayTimeChange"
autoplay
live
/> />
</div> </div>
<div class="player-option-box"> <div class="player-option-box">
<div> <VideoTimeline
<el-button-group> ref="Timeline"
<el-time-picker :init-time="initTime"
v-model="timeRange" :time-segments="timeSegments"
size="mini" :init-zoom-index="4"
is-range @timeChange="playTimeChange"
align="left" @mousedown="timelineMouseDown"
value-format="yyyy-MM-dd HH:mm:ss" @mouseup="mouseupTimeline"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围"
@change="timePickerChange"
/> />
</el-button-group> <div v-if="showTime" class="time-line-show">{{ showTimeValue }}</div>
</div>
<el-button-group> <div style="height: 40px; background-color: #383838; display: grid; grid-template-columns: 1fr 400px 1fr">
<el-button size="mini" class="iconfont icon-zanting" title="开始" @click="control(0, 0)" /> <div style="text-align: left;">
<el-button size="mini" class="iconfont icon-kaishi" title="暂停" @click="control(1, 0)" /> <div class="record-play-control" style="background-color: transparent; box-shadow: 0 0 10px transparent">
<el-button size="mini" class="iconfont icon-stop" title="结束" @click="control(2, 0)" /> <a
<el-dropdown size="mini" title="播放倍速" @command="scale"> target="_blank"
<el-button size="mini"> class="record-play-control-item iconfont icon-list"
快进/快退 <i class="el-icon-arrow-down el-icon--right" /> title="列表"
</el-button> @click="sidebarControl()"
/>
<a
target="_blank"
class="record-play-control-item iconfont icon-camera1196054easyiconnet"
title="截图"
@click="snap()"
/>
<a
target="_blank"
class="record-play-control-item iconfont icon-xiazai1"
title="下载录像"
@click="chooseTimeForRecord()"
/>
<!-- <a target="_blank" class="record-play-control-item iconfont icon-xiazai011" title="下载" @click="gbPause()" />-->
</div>
</div>
<div style="text-align: center;">
<div class="record-play-control">
<a
v-if="chooseFileIndex > 0"
target="_blank"
class="record-play-control-item iconfont icon-diyigeshipin"
title="上一个"
@click="playLast()"
/>
<a
v-else
style="color: #acacac; cursor: not-allowed"
target="_blank"
class="record-play-control-item iconfont icon-diyigeshipin"
title="上一个"
/>
<a
target="_blank"
class="record-play-control-item iconfont icon-kuaijin"
title="快退五秒"
@click="seekBackward()"
/>
<a
target="_blank"
class="record-play-control-item iconfont icon-stop1"
style="font-size: 14px"
title="停止"
@click="stopPLay()"
/>
<a
v-if="playing"
target="_blank"
class="record-play-control-item iconfont icon-zanting"
title="暂停"
@click="pausePlay()"
/>
<a v-if="!playing" target="_blank" class="record-play-control-item iconfont icon-kaishi" title="播放" @click="play()" />
<a
target="_blank"
class="record-play-control-item iconfont icon-houtui"
title="快进五秒"
@click="seekForward()"
/>
<a
v-if="chooseFileIndex < detailFiles.length - 1"
target="_blank"
class="record-play-control-item iconfont icon-zuihouyigeshipin"
title="下一个"
@click="playNext()"
/>
<a
v-else
style="color: #acacac; cursor: not-allowed"
target="_blank"
class="record-play-control-item iconfont icon-zuihouyigeshipin"
title="下一个"
@click="playNext()"
/>
<el-dropdown @command="changePlaySpeed">
<a
target="_blank"
class="record-play-control-item record-play-control-speed"
title="倍速播放"
>快进/快退</a>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[3, 1]">正常快进</el-dropdown-item> <el-dropdown-item :command="[3, 1]">正常快进</el-dropdown-item>
<el-dropdown-item :command="[3, 2]">2倍速快进</el-dropdown-item> <el-dropdown-item :command="[3, 2]">2倍速快进</el-dropdown-item>
@ -81,111 +175,118 @@
<el-dropdown-item :command="[4, 16]">16倍速快退</el-dropdown-item> <el-dropdown-item :command="[4, 16]">16倍速快退</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button size="mini" class="iconfont icon-xiazai1" title="下载选定录像" @click="downloadRecord()" />
<el-button v-if="sliderMIn === 0 && sliderMax === 86400" size="mini" class="iconfont icon-slider" title="放大滑块" @click="setSliderFit()" />
<el-button v-if="sliderMIn !== 0 || sliderMax !== 86400" size="mini" class="iconfont icon-slider-right" title="恢复滑块" @click="setSliderFit()" />
</el-button-group>
</div> </div>
<el-slider </div>
id="playtimeSlider" <div style="text-align: right;">
v-model="playTime" <div class="record-play-control" style="background-color: transparent; box-shadow: 0 0 10px transparent">
class="playtime-slider" <a
:disabled="detailFiles.length === 0" v-if="!isFullScreen"
:min="sliderMIn" target="_blank"
:max="sliderMax" class="record-play-control-item iconfont icon-fangdazhanshi"
:range="true" title="全屏"
:format-tooltip="playTimeFormat" @click="fullScreen()"
:marks="playTimeSliderMarks" />
@change="playTimeChange" <a
v-else
target="_blank"
class="record-play-control-item iconfont icon-suoxiao1"
title="全屏"
@click="fullScreen()"
/> />
<div class="slider-val-box">
<div v-for="item of detailFiles" class="slider-val" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'" />
</div> </div>
</div> </div>
</div>
</el-main> </div>
</el-container> </div>
<record-download ref="recordDownload" />
<chooseTimeRange ref="chooseTimeRange" />
</div> </div>
</template> </template>
<script> <script>
import player from '../../common/jessibuca.vue'
import h265web from '../../common/h265web.vue'
import VideoTimeline from '../../common/VideoTimeLine/index.vue'
import recordDownload from '../../dialog/recordDownload.vue'
import ChooseTimeRange from '../../dialog/chooseTimeRange.vue'
import moment from 'moment' import moment from 'moment'
import screenfull from 'screenfull'
export default { export default {
name: 'App', name: 'DeviceRecord',
components: { components: {
player h265web, VideoTimeline, recordDownload, ChooseTimeRange
}, },
data() { data() {
return { return {
showSidebar: false,
phoneNumber: this.$route.params.phoneNumber, phoneNumber: this.$route.params.phoneNumber,
channelId: this.$route.params.channelId, channelId: this.$route.params.channelId,
recordsLoading: false,
streamId: '',
hasAudio: false,
detailFiles: [],
chooseDate: null,
videoUrl: null,
chooseFile: null,
streamInfo: null,
app: null,
mediaServerId: null, mediaServerId: null,
ssrc: null, dateFilesObj: [],
mediaServerList: [],
sliderMIn: 0, detailFiles: [],
sliderMax: 86400, videoUrl: null,
autoPlay: true, streamInfo: null,
taskUpdate: null, loading: false,
tabVal: 'running', chooseDate: null,
recordListStyle: {
height: this.winHeight + 'px',
overflow: 'auto',
margin: '10px auto 10px auto'
},
playerStyle: {
'margin': '0 auto 20px auto',
'height': this.winHeight + 'px'
},
winHeight: window.innerHeight - 240,
playTime: null, playTime: null,
timeRange: null, playerTime: 0,
startTime: null, playSpeed: 1,
endTime: null, chooseFileIndex: null,
playTimeSliderMarks: { queryDate: new Date(),
0: '00:00', currentPage: 1,
3600: '01:00', count: 1000000, // TODO 分页导致滑轨视频有效值无法获取完全
7200: '02:00', total: 0,
10800: '03:00', playLoading: false,
14400: '04:00', showTime: true,
18000: '05:00', isFullScreen: false,
21600: '06:00', playSeekValue: 0,
25200: '07:00', playing: false,
28800: '08:00', taskTimeRange: [],
32400: '09:00', timeFormat: '00:00:00',
36000: '10:00', initTime: null,
39600: '11:00', timelineControl: false,
43200: '12:00', showOtherSpeed: true,
46800: '13:00', timeSegments: [],
50400: '14:00', pickerOptions: {
54000: '15:00', cellClassName: (date) => {
57600: '16:00', // 通过显示一个点标识这一天有录像
61200: '17:00', const time = moment(date).format('YYYY-MM-DD')
64800: '18:00', if (this.dateFilesObj[time]) {
68400: '19:00', return 'data-picker-true'
72000: '20:00', } else {
75600: '21:00', return 'data-picker-false'
79200: '22:00',
82800: '23:00',
86400: '24:00'
} }
} }
}, },
}
},
computed: { computed: {
boxStyle() {
if (this.showSidebar) {
return {
display: 'grid',
gridTemplateColumns: '210px minmax(0, 1fr)'
}
} else {
return {
display: 'grid', gridTemplateColumns: '0 minmax(0, 1fr)'
}
}
},
showTimeValue() {
return moment(this.playTime).format('YYYY-MM-DD HH:mm:ss')
},
startTime() {
return this.chooseDate + ' 00:00:00'
},
endTime() {
return this.chooseDate + ' 23:59:59'
}
}, },
mounted() { mounted() {
this.recordListStyle.height = this.winHeight + 'px' // 查询当年有视频的日期
this.playerStyle['height'] = this.winHeight + 'px'
this.chooseDate = moment().format('YYYY-MM-DD') this.chooseDate = moment().format('YYYY-MM-DD')
this.dateChange() this.dateChange()
window.addEventListener('beforeunload', this.stopPlayRecord) window.addEventListener('beforeunload', this.stopPlayRecord)
@ -195,73 +296,163 @@ export default {
window.removeEventListener('beforeunload', this.stopPlayRecord) window.removeEventListener('beforeunload', this.stopPlayRecord)
}, },
methods: { methods: {
dateChange() { sidebarControl() {
if (!this.chooseDate) { this.showSidebar = !this.showSidebar
},
snap() {
this.$refs.recordVideoPlayer.screenshot()
},
chooseTimeForRecord() {
let startTime = this.startTime
let endTime = this.endTime
if (this.detailFiles.length > 0) {
startTime = this.detailFiles[0].startTime
endTime = this.detailFiles[this.detailFiles.length - 1].endTime
}
console.log(startTime)
console.log(endTime)
this.$refs.chooseTimeRange.openDialog([new Date(startTime), new Date(endTime)], (time) => {
console.log(time)
const startTime = moment(time[0]).format('YYYY-MM-DD HH:mm:ss')
const endTime = moment(time[1]).format('YYYY-MM-DD HH:mm:ss')
this.downloadFile({
startTime: startTime,
endTime: endTime
})
})
},
playLast() {
// 播放上一个
if (this.chooseFileIndex === 0) {
return return
} }
this.chooseFile(this.chooseFileIndex - 1)
this.setTime(this.chooseDate + ' 00:00:00', this.chooseDate + ' 23:59:59') },
this.recordsLoading = true playNext() {
// 播放上一个
if (this.chooseFileIndex === this.detailFiles.length - 1) {
return
}
this.chooseFile(this.chooseFileIndex + 1)
},
changePlaySpeed(speed) {
console.log(this.streamInfo)
console.log(speed)
// 倍速播放
this.playSpeed = speed
this.$store.dispatch('playback/setSpeed', [this.streamInfo.stream, speed])
.then(data => {
this.$refs.recordVideoPlayer.setPlaybackRate(this.playSpeed)
})
.catch((err) => {
console.log(err)
})
},
seekBackward() {
// 快退五秒
this.playSeekValue -= 5 * 1000
this.play()
},
seekForward() {
// 快进五秒
this.playSeekValue += 5 * 1000
this.play()
},
stopPLay() {
// 停止
this.$refs.recordVideoPlayer.destroy()
},
pausePlay() {
// 暂停
this.$refs.recordVideoPlayer.pause()
},
play() {
if (this.$refs.recordVideoPlayer.loaded) {
this.$refs.recordVideoPlayer.unPause()
} else {
this.playRecord(this.showTimeValue, this.endTime)
}
},
fullScreen() {
// 全屏
if (this.isFullScreen) {
screenfull.exit()
this.isFullScreen = false
return
}
const playerWidth = this.$refs.recordVideoPlayer.playerWidth
const playerHeight = this.$refs.recordVideoPlayer.playerHeight
screenfull.request(document.getElementById('playerBox'))
screenfull.on('change', (event) => {
this.$refs.recordVideoPlayer.resize(playerWidth, playerHeight)
this.isFullScreen = screenfull.isFullscreen
})
this.isFullScreen = true
},
dateChange() {
this.detailFiles = [] this.detailFiles = []
this.$axios({ this.$store.dispatch('jtDevice/queryRecordList', {
method: 'get',
url: '/api/jt1078/record/list',
params: {
phoneNumber: this.phoneNumber, phoneNumber: this.phoneNumber,
channelId: this.channelId, channelId: this.channelId,
startTime: this.startTime, startTime: this.startTime,
endTime: this.endTime endTime: this.endTime
} })
}).then((res) => { .then((data) => {
this.recordsLoading = false
if (res.data.code === 0) {
// 处理时间信息 // 处理时间信息
this.detailFiles = res.data.data if (data.length === 0) {
} else { return
this.$message({ }
showClose: true, this.detailFiles = data
message: res.data.msg, this.initTime = new Date(this.detailFiles[0].startTime).getTime()
type: 'error' for (let i = 0; i < this.detailFiles.length; i++) {
this.timeSegments.push({
beginTime: new Date(this.detailFiles[i].startTime).getTime(),
endTime: new Date(this.detailFiles[i].endTime).getTime(),
color: '#017690',
startRatio: 0.7,
endRatio: 0.85,
index: i
}) })
} }
}).catch((e) => { })
.catch((e) => {
console.log(e)
})
.finally(() => {
this.recordsLoading = false this.recordsLoading = false
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
}) })
}, },
moment: function(v) { stopPlayRecord(callback) {
return moment(v) console.log('停止录像回放')
}, if (this.streamInfo !== null) {
setTime: function(startTime, endTime) { this.$refs['recordVideoPlayer'].pause()
this.startTime = startTime this.videoUrl = ''
this.endTime = endTime this.$store.dispatch('jtDevice/stopPlayback', {
const start = (new Date(this.startTime).getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()) / 1000 phoneNumber: this.phoneNumber,
const end = (new Date(this.endTime).getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()) / 1000 channelId: this.channelId,
console.log(start) streamId: this.streamId
console.log(end) })
this.playTime = [start, end] .then(function(res) {
this.timeRange = [startTime, endTime] if (callback) callback()
},
videoError: function(e) {
console.log('播放器错误：' + JSON.stringify(e))
},
checkedFile(file) {
this.chooseFile = file
this.setTime(file.startTime, file.endTime)
// 开始回放
this.playRecord()
},
playRecord: function() {
if (this.streamId !== '') {
this.stopPlayRecord(() => {
this.streamId = ''
this.playRecord()
}) })
} else { } else {
this.$axios({ if (callback) callback()
method: 'get', }
url: '/api/jt1078/playback/start/', },
params: { chooseFile(index) {
this.chooseFileIndex = index
const chooseFile = this.detailFiles[this.chooseFileIndex]
this.playTime = new Date(chooseFile.startTime).getTime()
this.playRecord(chooseFile.startTime, this.endTime)
},
playRecord(startTime, endTime) {
if (this.streamInfo !== null) {
this.stopPlayRecord(() => {
this.playRecord(startTime, endTime)
})
} else {
this.playerTime = 0
this.$store.dispatch('jtDevice/startPlayback', {
phoneNumber: this.phoneNumber, phoneNumber: this.phoneNumber,
channelId: this.channelId, channelId: this.channelId,
startTime: this.startTime, startTime: this.startTime,
@ -270,106 +461,13 @@ export default {
rate: 0, rate: 0,
playbackType: 0, playbackType: 0,
playbackSpeed: 0 playbackSpeed: 0
} })
}).then((res) => { .then((data) => {
if (res.data.code === 0) { this.streamInfo = data
this.streamInfo = res.data.data
this.app = this.streamInfo.app
this.streamId = this.streamInfo.stream
this.mediaServerId = this.streamInfo.mediaServerId
this.ssrc = this.streamInfo.ssrc
this.videoUrl = this.getUrlByStreamInfo() this.videoUrl = this.getUrlByStreamInfo()
this.hasAudio = this.streamInfo.tracks && this.streamInfo.tracks.length > 1 this.hasAudio = this.streamInfo.tracks && this.streamInfo.tracks.length > 1
} else {
this.$message({
showClose: true,
message: res.data.msg,
type: 'error'
}) })
} }
})
}
},
gbPlay() {
console.log('前端控制：播放')
this.$axios({
method: 'get',
url: '/api/playback/resume/' + this.streamId
}).then((res) => {
this.$refs['recordVideoPlayer'].play(this.videoUrl)
})
},
control(command, playbackSpeed, time) {
this.$axios({
method: 'get',
url: '/api/jt1078/playback/control',
params: {
phoneNumber: this.phoneNumber,
channelId: this.channelId,
command: command,
playbackSpeed: playbackSpeed,
time: time
}
}).then(function(res) {})
},
scale(command) {
this.control(command[0], command[1])
},
downloadRecord: function(row) {
const baseUrl = window.baseUrl ? window.baseUrl : ''
const downloadFile = ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) +
`/api/jt1078/playback/download?phoneNumber=${this.phoneNumber}&channelId=${this.channelId}&startTime=${row.startTime}&endTime=${row.endTime}` +
`&alarmSign=${row.alarmSign}&mediaType=${row.mediaType}&streamType=${row.streamType}&storageType=${row.storageType}`
console.log(downloadFile)
const x = new XMLHttpRequest()
x.open('GET', downloadFile, true)
x.responseType = 'blob'
x.onload = (e) => {
const url = window.URL.createObjectURL(x.response)
const a = document.createElement('a')
a.href = url
a.download = this.phoneNumber + '-' + this.channelId + '.mp4'
a.click()
}
x.send()
},
stopDownloadRecord: function(callback) {
this.$refs['recordVideoPlayer'].pause()
this.videoUrl = ''
this.$axios({
method: 'get',
url: '/api/gb_record/download/stop/' + this.deviceId + '/' + this.channelId + '/' + this.streamId
}).then((res) => {
if (callback) callback(res)
})
},
stopPlayRecord: function(callback) {
console.log('停止录像回放')
if (this.streamId !== '') {
this.$refs['recordVideoPlayer'].pause()
this.videoUrl = ''
this.$axios({
method: 'get',
url: '/api/jt1078/playback/stop/',
params: {
phoneNumber: this.phoneNumber,
channelId: this.channelId,
streamId: this.streamId
}
}).then(function(res) {
if (callback) callback()
})
}
},
getDataWidth(item) {
const timeForFile = this.getTimeForFile(item)
const result = (timeForFile[2]) / ((this.sliderMax - this.sliderMIn) * 1000)
return result * 100
},
getDataLeft(item) {
const timeForFile = this.getTimeForFile(item)
const differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()
return parseFloat((differenceTime - this.sliderMIn * 1000) / ((this.sliderMax - this.sliderMIn) * 1000)) * 100
}, },
getUrlByStreamInfo() { getUrlByStreamInfo() {
if (location.protocol === 'https:') { if (location.protocol === 'https:') {
@ -379,128 +477,86 @@ export default {
} }
return this.videoUrl return this.videoUrl
}, },
timePickerChange: function(val) { downloadFile(row) {
this.setTime(val[0], val[1]) if (!row) {
}, const startTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + this.playTime[0] * 1000).format('YYYY-MM-DD HH:mm:ss')
playTimeChange(val) { const endTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + this.playTime[1] * 1000).format('YYYY-MM-DD HH:mm:ss')
console.log(val) row = {
startTime: startTimeStr,
const startTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + val[0] * 1000).format('YYYY-MM-DD HH:mm:ss') endTime: endTimeStr
const endTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + val[1] * 1000).format('YYYY-MM-DD HH:mm:ss')
this.setTime(startTimeStr, endTimeStr)
this.playRecord()
},
setSliderFit() {
if (this.sliderMIn === 0 && this.sliderMax === 86400) {
if (this.detailFiles.length > 0) {
const timeForFile = this.getTimeForFile(this.detailFiles[0])
const lastTimeForFile = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1])
const timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + ' ' + '00:00:00').getTime()
const lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + ' ' + '00:00:00').getTime()
this.playTime = parseInt(timeNum / 1000)
this.sliderMIn = parseInt(timeNum / 1000 - timeNum / 1000 % (60 * 60))
this.sliderMax = parseInt(lastTimeNum / 1000 - lastTimeNum / 1000 % (60 * 60)) + 60 * 60
this.playTime = [this.sliderMIn, this.sliderMax]
} }
} else {
this.sliderMIn = 0
this.sliderMax = 86400
} }
}, if (this.streamInfo !== null) {
getTimeForFile(file) {
const startTime = new Date(file.startTime)
const endTime = new Date(file.endTime)
return [startTime, endTime, endTime.getTime() - startTime.getTime()]
},
playTimeFormat(val) {
const h = parseInt(val / 3600)
const m = parseInt((val - h * 3600) / 60)
const s = parseInt(val - h * 3600 - m * 60)
let hStr = h
let mStr = m
let sStr = s
if (h < 10) {
hStr = '0' + hStr
}
if (m < 10) {
mStr = '0' + mStr; s
}
if (s < 10) {
sStr = '0' + sStr
}
return hStr + ':' + mStr + ':' + sStr
},
goBack() {
// 如果正在进行录像回放则，发送停止
if (this.streamId !== '') {
this.stopPlayRecord(() => { this.stopPlayRecord(() => {
this.streamId = '' this.downloadFile(row)
})
} else {
const loading = this.$loading({
lock: true,
text: '正在请求录像',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
this.$store.dispatch('gbRecord/startDownLoad', [
this.deviceId, this.channelId, row.startTime, row.endTime, this.playSpeedRange[this.playSpeedRange.length - 1]
])
.then(streamInfo => {
this.$refs.recordDownload.openDialog(this.deviceId, this.channelId, streamInfo.app, streamInfo.stream, streamInfo.mediaServerId)
})
.finally(() => {
loading.close()
}) })
} }
window.history.go(-1) },
getFileShowName(item) {
return moment(item.startTime).format('HH:mm:ss') + '-' + moment(item.endTime).format('HH:mm:ss')
},
showPlayTimeChange(val) {
this.playTime += (val * 1000 - this.playerTime)
this.playerTime = val * 1000
},
playingChange(val) {
this.playing = val
},
playTimeChange(val) {
if (val === this.playTime) {
return
}
this.playTime = val
},
timelineMouseDown() {
this.timelineControl = true
},
mouseupTimeline(event) {
if (!this.timelineControl) {
this.timelineControl = false
return
}
this.timelineControl = false
this.playRecord(this.showTimeValue, this.endTime)
} }
} }
} }
</script> </script>
<style> <style>
.el-slider__runway {
background-color:rgba(206, 206, 206, 0.47) !important;
}
.el-slider__bar {
background-color: rgba(153, 153, 153, 0) !important;
}
.playtime-slider {
position: relative;
z-index: 100;
}
.data-picker-true{
}
.data-picker-true:after{
content: "";
position: absolute;
width: 4px;
height: 4px;
background-color: #606060;
border-radius: 4px;
left: 45%;
top: 74%;
}
.data-picker-false{
}
.slider-val-box{
height: 6px;
position: relative;
top: -22px;
}
.slider-val{
height: 6px;
background-color: #007CFF;
position: absolute;
}
.record-list-box-box { .record-list-box-box {
width: 250px; width: fit-content;
float: left; float: left;
} }
.record-list-box { .record-list-box {
width: 100%;
overflow: auto; overflow: auto;
width: 220px;
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-top: 0px;
padding: 1rem 0;
background-color: #FFF; background-color: #FFF;
margin-top: 10px; margin-top: 10px;
} }
.record-list { .record-list {
list-style: none; list-style: none;
padding: 0; padding: 0;
@ -508,25 +564,60 @@ export default {
background-color: #FFF; background-color: #FFF;
} }
.record-list-no-val { .record-list-no-val {
position: absolute; width: fit-content;
position: relative;
color: #9f9f9f; color: #9f9f9f;
top: 50%; top: 50%;
left: 110px; left: calc(50% - 2rem);
} }
.record-list-item { .record-list-item {
padding: 0; padding: 0;
margin: 0; margin: 0;
margin: 0.5rem 0; margin: 0.5rem 0;
cursor: pointer; cursor: pointer;
} }
.record-list-option {
width: 10px;
float: left;
margin-top: 39px;
.record-play-control {
height: 32px;
line-height: 32px;
display: inline-block;
width: fit-content;
padding: 0 10px;
-webkit-box-shadow: 0 0 10px #262626;
box-shadow: 0 0 10px #262626;
background-color: #262626;
margin: 4px 0;
} }
.record-play-control-item {
display: inline-block;
padding: 0 10px;
color: #fff;
margin-right: 2px;
}
.record-play-control-item:hover {
color: #1f83e6;
}
.record-play-control-speed {
font-weight: bold;
color: #fff;
user-select: none;
}
.player-option-box { .player-option-box {
padding: 0 20px; height: 50px
}
.time-line-show {
position: relative;
color: rgba(250, 249, 249, 0.89);
left: calc(50% - 85px);
top: -72px;
text-shadow: 1px 0 #5f6b7c, -1px 0 #5f6b7c, 0 1px #5f6b7c, 0 -1px #5f6b7c, 1.1px 1.1px #5f6b7c, 1.1px -1.1px #5f6b7c, -1.1px 1.1px #5f6b7c, -1.1px -1.1px #5f6b7c;
} }
</style> </style>

485
web/src/views/jtDevice/channel/record2.vue Executable file
View File

@ -0,0 +1,485 @@
<template>
<div style="width: 100%">
<div class="page-header">
<div class="page-title">
<el-page-header content="部标录像" @back="goBack" />
</div>
</div>
<el-container>
<el-aside width="300px">
<div class="record-list-box-box">
<el-date-picker v-model="chooseDate" size="mini" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()" />
<div v-loading="recordsLoading" class="record-list-box" :style="recordListStyle">
<ul v-if="detailFiles.length >0" class="infinite-list record-list">
<li v-for="item in detailFiles" class="infinite-list-item record-list-item">
<el-tag v-if="chooseFile !== item" @click="checkedFile(item)">
<i class="el-icon-video-camera" />
{{ moment(item.startTime).format('HH:mm:ss') }}-{{ moment(item.endTime).format('HH:mm:ss') }}
</el-tag>
<el-tag v-if="chooseFile === item" type="danger">
<i class="el-icon-video-camera" />
{{ moment(item.startTime).format('HH:mm:ss') }}-{{ moment(item.endTime).format('HH:mm:ss') }}
</el-tag>
<i style="color: #409EFF;margin-left: 5px;" class="el-icon-download" @click="downloadRecord(item)" />
</li>
</ul>
</div>
<div v-if="detailFiles.length ==0" size="mini" class="record-list-no-val">暂无数据</div>
</div>
</el-aside>
<el-main style="padding-bottom: 10px;">
<div class="playBox" :style="playerStyle">
<player
ref="recordVideoPlayer"
:video-url="videoUrl"
:error="videoError"
:message="videoError"
:has-audio="hasAudio"
style="max-height: 100%"
fluent
autoplay
live
/>
</div>
<div class="player-option-box">
<div>
<el-button-group>
<el-time-picker
v-model="timeRange"
size="mini"
is-range
align="left"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围"
@change="timePickerChange"
/>
</el-button-group>
<el-button-group>
<el-button size="mini" class="iconfont icon-zanting" title="开始" @click="control(0, 0)" />
<el-button size="mini" class="iconfont icon-kaishi" title="暂停" @click="control(1, 0)" />
<el-button size="mini" class="iconfont icon-stop" title="结束" @click="control(2, 0)" />
<el-dropdown size="mini" title="播放倍速" @command="scale">
<el-button size="mini">
快进/快退 <i class="el-icon-arrow-down el-icon--right" />
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[3, 1]">正常快进</el-dropdown-item>
<el-dropdown-item :command="[3, 2]">2倍速快进</el-dropdown-item>
<el-dropdown-item :command="[3, 4]">4倍速快进</el-dropdown-item>
<el-dropdown-item :command="[3, 8]">8倍速快进</el-dropdown-item>
<el-dropdown-item :command="[3, 16]">16倍速快进</el-dropdown-item>
<el-dropdown-item :command="[4, 1]">正常快退</el-dropdown-item>
<el-dropdown-item :command="[4, 2]">2倍速快退</el-dropdown-item>
<el-dropdown-item :command="[4, 4]">4倍速快退</el-dropdown-item>
<el-dropdown-item :command="[4, 8]">8倍速快退</el-dropdown-item>
<el-dropdown-item :command="[4, 16]">16倍速快退</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button size="mini" class="iconfont icon-xiazai1" title="下载选定录像" @click="downloadRecord()" />
<el-button v-if="sliderMIn === 0 && sliderMax === 86400" size="mini" class="iconfont icon-slider" title="放大滑块" @click="setSliderFit()" />
<el-button v-if="sliderMIn !== 0 || sliderMax !== 86400" size="mini" class="iconfont icon-slider-right" title="恢复滑块" @click="setSliderFit()" />
</el-button-group>
</div>
<el-slider
id="playtimeSlider"
v-model="playTime"
class="playtime-slider"
:disabled="detailFiles.length === 0"
:min="sliderMIn"
:max="sliderMax"
:range="true"
:format-tooltip="playTimeFormat"
:marks="playTimeSliderMarks"
@change="playTimeChange"
/>
<div class="slider-val-box">
<div v-for="item of detailFiles" class="slider-val" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'" />
</div>
</div>
</el-main>
</el-container>
</div>
</template>
<script>
import player from '../../common/jessibuca.vue'
import moment from 'moment'
export default {
name: 'App',
components: {
player
},
data() {
return {
phoneNumber: this.$route.params.phoneNumber,
channelId: this.$route.params.channelId,
recordsLoading: false,
streamId: '',
hasAudio: false,
detailFiles: [],
chooseDate: null,
videoUrl: null,
chooseFile: null,
streamInfo: null,
app: null,
mediaServerId: null,
ssrc: null,
sliderMIn: 0,
sliderMax: 86400,
autoPlay: true,
taskUpdate: null,
tabVal: 'running',
recordListStyle: {
height: this.winHeight + 'px',
overflow: 'auto',
margin: '10px auto 10px auto'
},
playerStyle: {
'margin': '0 auto 20px auto',
'height': this.winHeight + 'px'
},
winHeight: window.innerHeight - 240,
playTime: null,
timeRange: null,
startTime: null,
endTime: null,
playTimeSliderMarks: {
0: '00:00',
3600: '01:00',
7200: '02:00',
10800: '03:00',
14400: '04:00',
18000: '05:00',
21600: '06:00',
25200: '07:00',
28800: '08:00',
32400: '09:00',
36000: '10:00',
39600: '11:00',
43200: '12:00',
46800: '13:00',
50400: '14:00',
54000: '15:00',
57600: '16:00',
61200: '17:00',
64800: '18:00',
68400: '19:00',
72000: '20:00',
75600: '21:00',
79200: '22:00',
82800: '23:00',
86400: '24:00'
}
}
},
computed: {
},
mounted() {
this.recordListStyle.height = this.winHeight + 'px'
this.playerStyle['height'] = this.winHeight + 'px'
this.chooseDate = moment().format('YYYY-MM-DD')
this.dateChange()
window.addEventListener('beforeunload', this.stopPlayRecord)
},
destroyed() {
this.$destroy('recordVideoPlayer')
window.removeEventListener('beforeunload', this.stopPlayRecord)
},
methods: {
dateChange() {
if (!this.chooseDate) {
return
}
this.setTime(this.chooseDate + ' 00:00:00', this.chooseDate + ' 23:59:59')
this.recordsLoading = true
this.detailFiles = []
this.$store.dispatch('jtDevice/queryRecordList', {
phoneNumber: this.phoneNumber,
channelId: this.channelId,
startTime: this.startTime,
endTime: this.endTime
})
.then((data) => {
this.detailFiles = data
})
.catch((e) => {
console.log(e)
})
.finally(() => {
this.recordsLoading = false
})
},
moment: function(v) {
return moment(v)
},
setTime: function(startTime, endTime) {
this.startTime = startTime
this.endTime = endTime
const start = (new Date(this.startTime).getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()) / 1000
const end = (new Date(this.endTime).getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()) / 1000
console.log(start)
console.log(end)
this.playTime = [start, end]
this.timeRange = [startTime, endTime]
},
videoError: function(e) {
console.log('播放器错误：' + JSON.stringify(e))
},
checkedFile(file) {
this.chooseFile = file
this.setTime(file.startTime, file.endTime)
// 开始回放
this.playRecord()
},
playRecord: function() {
if (this.streamId !== '') {
this.stopPlayRecord(() => {
this.streamId = ''
this.playRecord()
})
} else {
this.$store.dispatch('jtDevice/startPlayback', {
phoneNumber: this.phoneNumber,
channelId: this.channelId,
startTime: this.startTime,
endTime: this.endTime,
type: 0,
rate: 0,
playbackType: 0,
playbackSpeed: 0
})
.then((data) => {
this.streamInfo = data
this.app = this.streamInfo.app
this.streamId = this.streamInfo.stream
this.mediaServerId = this.streamInfo.mediaServerId
this.ssrc = this.streamInfo.ssrc
this.videoUrl = this.getUrlByStreamInfo()
this.hasAudio = this.streamInfo.tracks && this.streamInfo.tracks.length > 1
})
}
},
control(command, playbackSpeed, time) {
this.$store.dispatch('jtDevice/controlPlayback', {
phoneNumber: this.phoneNumber,
channelId: this.channelId,
command: command,
playbackSpeed: playbackSpeed,
time: time
})
},
scale(command) {
this.control(command[0], command[1])
},
downloadRecord: function(row) {
const baseUrl = window.baseUrl ? window.baseUrl : ''
const downloadFile = ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) +
`/api/jt1078/playback/download?phoneNumber=${this.phoneNumber}&channelId=${this.channelId}&startTime=${row.startTime}&endTime=${row.endTime}` +
`&alarmSign=${row.alarmSign}&mediaType=${row.mediaType}&streamType=${row.streamType}&storageType=${row.storageType}`
console.log(downloadFile)
const x = new XMLHttpRequest()
x.open('GET', downloadFile, true)
x.responseType = 'blob'
x.onload = (e) => {
const url = window.URL.createObjectURL(x.response)
const a = document.createElement('a')
a.href = url
a.download = this.phoneNumber + '-' + this.channelId + '.mp4'
a.click()
}
x.send()
},
stopPlayRecord: function(callback) {
console.log('停止录像回放')
if (this.streamId !== '') {
this.$refs['recordVideoPlayer'].pause()
this.videoUrl = ''
this.$store.dispatch('jtDevice/stopPlayback', {
phoneNumber: this.phoneNumber,
channelId: this.channelId,
streamId: this.streamId
})
.then(function(res) {
if (callback) callback()
})
}
},
getDataWidth(item) {
const timeForFile = this.getTimeForFile(item)
const result = (timeForFile[2]) / ((this.sliderMax - this.sliderMIn) * 1000)
return result * 100
},
getDataLeft(item) {
const timeForFile = this.getTimeForFile(item)
const differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()
return parseFloat((differenceTime - this.sliderMIn * 1000) / ((this.sliderMax - this.sliderMIn) * 1000)) * 100
},
getUrlByStreamInfo() {
if (location.protocol === 'https:') {
this.videoUrl = this.streamInfo['wss_flv']
} else {
this.videoUrl = this.streamInfo['ws_flv']
}
return this.videoUrl
},
timePickerChange: function(val) {
this.setTime(val[0], val[1])
},
playTimeChange(val) {
console.log(val)
const startTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + val[0] * 1000).format('YYYY-MM-DD HH:mm:ss')
const endTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + val[1] * 1000).format('YYYY-MM-DD HH:mm:ss')
this.setTime(startTimeStr, endTimeStr)
this.playRecord()
},
setSliderFit() {
if (this.sliderMIn === 0 && this.sliderMax === 86400) {
if (this.detailFiles.length > 0) {
const timeForFile = this.getTimeForFile(this.detailFiles[0])
const lastTimeForFile = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1])
const timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + ' ' + '00:00:00').getTime()
const lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + ' ' + '00:00:00').getTime()
this.playTime = parseInt(timeNum / 1000)
this.sliderMIn = parseInt(timeNum / 1000 - timeNum / 1000 % (60 * 60))
this.sliderMax = parseInt(lastTimeNum / 1000 - lastTimeNum / 1000 % (60 * 60)) + 60 * 60
this.playTime = [this.sliderMIn, this.sliderMax]
}
} else {
this.sliderMIn = 0
this.sliderMax = 86400
}
},
getTimeForFile(file) {
const startTime = new Date(file.startTime)
const endTime = new Date(file.endTime)
return [startTime, endTime, endTime.getTime() - startTime.getTime()]
},
playTimeFormat(val) {
const h = parseInt(val / 3600)
const m = parseInt((val - h * 3600) / 60)
const s = parseInt(val - h * 3600 - m * 60)
let hStr = h
let mStr = m
let sStr = s
if (h < 10) {
hStr = '0' + hStr
}
if (m < 10) {
mStr = '0' + mStr; s
}
if (s < 10) {
sStr = '0' + sStr
}
return hStr + ':' + mStr + ':' + sStr
},
goBack() {
// 如果正在进行录像回放则，发送停止
if (this.streamId !== '') {
this.stopPlayRecord(() => {
this.streamId = ''
})
}
window.history.go(-1)
}
}
}
</script>
<style>
.el-slider__runway {
background-color:rgba(206, 206, 206, 0.47) !important;
}
.el-slider__bar {
background-color: rgba(153, 153, 153, 0) !important;
}
.playtime-slider {
position: relative;
z-index: 100;
}
.data-picker-true{
}
.data-picker-true:after{
content: "";
position: absolute;
width: 4px;
height: 4px;
background-color: #606060;
border-radius: 4px;
left: 45%;
top: 74%;
}
.data-picker-false{
}
.slider-val-box{
height: 6px;
position: relative;
top: -22px;
}
.slider-val{
height: 6px;
background-color: #007CFF;
position: absolute;
}
.record-list-box-box{
width: 250px;
float: left;
}
.record-list-box{
overflow: auto;
width: 220px;
list-style: none;
padding: 0;
margin: 0;
margin-top: 0px;
padding: 1rem 0;
background-color: #FFF;
margin-top: 10px;
}
.record-list{
list-style: none;
padding: 0;
margin: 0;
background-color: #FFF;
}
.record-list-no-val {
position: absolute;
color: #9f9f9f;
top: 50%;
left: 110px;
}
.record-list-item{
padding: 0;
margin: 0;
margin: 0.5rem 0;
cursor: pointer;
}
.record-list-option {
width: 10px;
float: left;
margin-top: 39px;
}
.player-option-box{
padding: 0 20px;
}
</style>

20
web/src/views/jtDevice/index.vue
View File

@ -1,31 +1,43 @@
<template> <template>
<div id="device" class="app-container"> <div id="device" class="app-container">
<deviceList v-show="deviceId === null" @show-channel="showChannelList" /> <deviceList v-show="show === 'device'" @show-channel="showChannelList" @show-param="showParam" />
<channelList v-if="deviceId !== null" :device-id="deviceId" @show-device="showDevice" /> <channelList v-if="show === 'channel'" :device-id="deviceId" @show-device="showDevice" />
<deviceParam v-if="show === 'param'" :phone-number="phoneNumber" @show-device="showDevice" />
</div> </div>
</template> </template>
<script> <script>
import deviceList from './list.vue' import deviceList from './list.vue'
import channelList from './channel/index.vue' import channelList from './channel/index.vue'
import deviceParam from './jtDeviceParam.vue'
export default { export default {
name: 'Device', name: 'Device',
components: { components: {
deviceList, deviceList,
channelList channelList,
deviceParam
}, },
data() { data() {
return { return {
deviceId: null show: 'device',
deviceId: null,
phoneNumber: null
} }
}, },
methods: { methods: {
showChannelList: function(deviceId) { showChannelList: function(deviceId) {
this.deviceId = deviceId this.deviceId = deviceId
this.show = 'channel'
},
showParam: function(phoneNumber) {
this.phoneNumber = phoneNumber
this.show = 'param'
}, },
showDevice: function() { showDevice: function() {
this.deviceId = null this.deviceId = null
this.phoneNumber = null
this.show = 'device'
} }
} }
} }

339
web/src/views/jtDevice/jtDeviceParam.vue Executable file
View File

@ -0,0 +1,339 @@
<template>
<div id="jtDeviceParam" style="width: 100%">
<div class="page-header">
<div class="page-title">
<el-page-header content="终端参数" @back="showDevice" />
</div>
</div>
<el-container v-loading="isLoading" style="height: 82vh; overflow: auto">
<el-main style="padding: 5px; background-color: #ffffff;">
<el-divider content-position="center">通讯参数</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item label="心跳发送间隔(秒)" prop="keepaliveInterval">
<el-input v-model="form.keepaliveInterval" clearable />
</el-form-item>
<el-form-item label="TCP消息应答超时(秒)" prop="tcpResponseTimeout">
<el-input v-model="form.tcpResponseTimeout" clearable />
</el-form-item>
<el-form-item label="TCP消息重传次数" prop="tcpRetransmissionCount">
<el-input v-model="form.tcpRetransmissionCount" clearable />
</el-form-item>
<el-form-item label="UDP消息应答超时时间(秒)" prop="udpResponseTimeout">
<el-input v-model="form.udpResponseTimeout" clearable />
</el-form-item>
<el-form-item label="UDP消息重传次数" prop="udpRetransmissionCount">
<el-input v-model="form.udpRetransmissionCount" clearable />
</el-form-item>
<el-form-item label="SMS 消息应答超时时间(秒)" prop="smsResponseTimeout">
<el-input v-model="form.smsResponseTimeout" clearable />
</el-form-item>
<el-form-item label="SMS 消息重传次数" prop="smsRetransmissionCount">
<el-input v-model="form.smsRetransmissionCount" clearable />
</el-form-item>
</el-form>
<el-divider content-position="center">服务器参数</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item label="APN(主)" prop="apnMaster">
<el-input v-model="form.apnMaster" clearable />
</el-form-item>
<el-form-item label="无线通信拨号用户名(主)" prop="dialingUsernameMaster">
<el-input v-model="form.dialingUsernameMaster" clearable />
</el-form-item>
<el-form-item label="无线通信拨号密码(主)" prop="dialingPasswordMaster">
<el-input v-model="form.dialingPasswordMaster" clearable />
</el-form-item>
<el-form-item label="IP或域名(主)" prop="addressMaster">
<el-input v-model="form.addressMaster" clearable />
</el-form-item>
<el-form-item label="APN(备)" prop="apnBackup">
<el-input v-model="form.apnBackup" clearable />
</el-form-item>
<el-form-item label="无线通信拨号用户名(备)" prop="dialingUsernameBackup">
<el-input v-model="form.dialingUsernameBackup" clearable />
</el-form-item>
<el-form-item label="无线通信拨号密码(备)" prop="dialingPasswordBackup">
<el-input v-model="form.dialingPasswordBackup" clearable />
</el-form-item>
<el-form-item label="IP或域名(备)" prop="addressBackup">
<el-input v-model="form.addressBackup" clearable />
</el-form-item>
<el-form-item label="APN(从)" prop="apnBackup">
<el-input v-model="form.apnBackup" clearable />
</el-form-item>
<el-form-item label="无线通信拨号用户名(从)" prop="dialingUsernameSlave">
<el-input v-model="form.dialingUsernameSlave" clearable />
</el-form-item>
<el-form-item label="无线通信拨号密码(从)" prop="dialingPasswordSlave">
<el-input v-model="form.dialingPasswordSlave" clearable />
</el-form-item>
<el-form-item label="IP或域名(从)" prop="addressSlave">
<el-input v-model="form.addressSlave" clearable />
</el-form-item>
<el-form-item label="IC卡认证服务器IP(主)" prop="addressIcMaster">
<el-input v-model="form.addressIcMaster" clearable />
</el-form-item>
<el-form-item label="IC卡认证服务器IP(备)" prop="addressIcMaster">
<el-input v-model="form.addressIcBackup" clearable />
</el-form-item>
<el-form-item label="IC卡认证服务器TCP端口" prop="tcpPortIcMaster">
<el-input v-model="form.tcpPortIcMaster" clearable />
</el-form-item>
<el-form-item label="IC卡认证服务器UDP端口" prop="udpPortIcMaster">
<el-input v-model="form.udpPortIcMaster" clearable />
</el-form-item>
</el-form>
<el-divider content-position="center">位置汇报</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item label="策略" prop="locationReportingStrategy">
<el-select v-model="form.locationReportingStrategy" style="float: left; width: 100%">
<el-option label="定时汇报" :value="0">定时汇报</el-option>
<el-option label="定距汇报" :value="1" />
<el-option label="定时和定距汇报" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="方案" prop="locationReportingPlan">
<el-select v-model="form.locationReportingPlan" style="float: left; width: 100%">
<el-option label="根据ACC状态" :value="0" />
<el-option label="登录状态和ACC状态" :value="1" />
</el-select>
</el-form-item>
<el-form-item label="驾驶员未登录汇报时间间隔(秒)" prop="reportingIntervalOffline">
<el-input v-model="form.reportingIntervalOffline" clearable />
</el-form-item>
<el-form-item label="休眠时汇报时间间隔(秒)" prop="reportingIntervalDormancy">
<el-input v-model="form.reportingIntervalDormancy" clearable />
</el-form-item>
<el-form-item label="紧急报警时汇报时间间隔(秒)" prop="reportingIntervalEmergencyAlarm">
<el-input v-model="form.reportingIntervalEmergencyAlarm" clearable />
</el-form-item>
<el-form-item label="缺省时间汇报间隔(秒)" prop="reportingIntervalDefault">
<el-input v-model="form.reportingIntervalDefault" clearable />
</el-form-item>
<el-form-item label="缺省距离汇报间隔(米)" prop="reportingDistanceDefault">
<el-input v-model="form.reportingDistanceDefault" clearable />
</el-form-item>
<el-form-item label="驾驶员未登录汇报距离间隔(米)" prop="reportingDistanceOffline">
<el-input v-model="form.reportingDistanceOffline" clearable />
</el-form-item>
<el-form-item label="休眠时汇报距离间隔(米)" prop="reportingDistanceDormancy">
<el-input v-model="form.reportingDistanceDormancy" clearable />
</el-form-item>
<el-form-item label="紧急报警时汇报距离间隔(米)" prop="reportingDistanceEmergencyAlarm">
<el-input v-model="form.reportingDistanceEmergencyAlarm" clearable />
</el-form-item>
<el-form-item label="拐点补传角度(度，小于180)" prop="inflectionPointAngle">
<el-input v-model="form.inflectionPointAngle" clearable />
</el-form-item>
</el-form>
<el-divider content-position="center">电话号码</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item label="监控平台电话号码" prop="platformPhoneNumber">
<el-input v-model="form.platformPhoneNumber" clearable />
</el-form-item>
<el-form-item label="复位电话号码" prop="phoneNumberForFactoryReset">
<el-input v-model="form.phoneNumberForFactoryReset" clearable />
</el-form-item>
<el-form-item label="监控平台SMS电话号码" prop="phoneNumberForSms">
<el-input v-model="form.phoneNumberForSms" clearable />
</el-form-item>
<el-form-item label="接收终端SMS文本报警号码" prop="phoneNumberForReceiveTextAlarm">
<el-input v-model="form.phoneNumberForReceiveTextAlarm" clearable />
</el-form-item>
<el-form-item label="终端电话接听策略" prop="locationReportingStrategy">
<el-select v-model="form.locationReportingStrategy" style="float: left; width: 100%">
<el-option label="自动接听" :value="0">定时汇报</el-option>
<el-option label="ACC ON时自动接听 ,OFF时手动接听" :value="1" />
</el-select>
</el-form-item>
<el-form-item label="每次最长通话时间(秒)" prop="longestCallTimeForPerSession">
<el-input v-model="form.longestCallTimeForPerSession" clearable />
</el-form-item>
<el-form-item label="当月最长通话时间(秒)" prop="longestCallTimeInMonth">
<el-input v-model="form.longestCallTimeInMonth" clearable />
</el-form-item>
<el-form-item label="监听电话号码" prop="phoneNumbersForListen">
<el-input v-model="form.phoneNumbersForListen" clearable />
</el-form-item>
<el-form-item label="监管平台特权短信号码" prop="privilegedSMSNumber">
<el-input v-model="form.privilegedSMSNumber" clearable />
</el-form-item>
</el-form>
<el-divider content-position="center">报警参数</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item label="报警屏蔽字(TODO)" prop="alarmMaskingWord">
<el-input v-model="form.alarmMaskingWord" clearable />
</el-form-item>
<el-form-item label="报警发送文本 SMS 开关(TODO)" prop="alarmSendsTextSmsSwitch">
<el-input v-model="form.alarmSendsTextSmsSwitch" clearable />
</el-form-item>
<el-form-item label="报警拍摄开关(TODO)" prop="alarmShootingSwitch">
<el-input v-model="form.alarmShootingSwitch" clearable />
</el-form-item>
<el-form-item label="报警拍摄存储标志(TODO)" prop="alarmShootingStorageFlags">
<el-input v-model="form.alarmShootingStorageFlags" clearable />
</el-form-item>
<el-form-item label="关键标志(TODO)" prop="KeySign">
<el-input v-model="form.KeySign" clearable />
</el-form-item>
<el-form-item label="电子围栏半径(米)" prop="fenceRadius">
<el-input v-model="form.fenceRadius" clearable />
</el-form-item>
</el-form>
<el-divider content-position="center">行驶参数</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item v-if="form.illegalDrivingPeriods" label="违规行驶时段-开始时间(HH:mm)" prop="illegalDrivingPeriods">
<el-input v-model="form.illegalDrivingPeriods.startTime" clearable />
</el-form-item>
<el-form-item v-if="form.illegalDrivingPeriods" label="违规行驶时段-结束时间(HH:mm)" prop="illegalDrivingPeriods">
<el-input v-model="form.illegalDrivingPeriods.endTime" clearable />
</el-form-item>
<el-form-item label="最高速度(千米每小时)" prop="topSpeed">
<el-input v-model="form.topSpeed" clearable />
</el-form-item>
<el-form-item label="超速持续时间(秒)" prop="overSpeedDuration">
<el-input v-model="form.overSpeedDuration" clearable />
</el-form-item>
<el-form-item label="连续驾驶时间门限(秒)" prop="continuousDrivingTimeThreshold">
<el-input v-model="form.continuousDrivingTimeThreshold" clearable />
</el-form-item>
<el-form-item label="当天累计驾驶时间门限(秒)" prop="cumulativeDrivingTimeThresholdForTheDay">
<el-input v-model="form.cumulativeDrivingTimeThresholdForTheDay" clearable />
</el-form-item>
<el-form-item label="最小休息时间(秒)" prop="minimumBreakTime">
<el-input v-model="form.minimumBreakTime" clearable />
</el-form-item>
<el-form-item label="最长停车时间(秒)" prop="maximumParkingTime">
<el-input v-model="form.maximumParkingTime" clearable />
</el-form-item>
<el-form-item label="超速预警差值(1/10 千米每小时)" prop="overSpeedWarningDifference">
<el-input v-model="form.overSpeedWarningDifference" clearable />
</el-form-item>
<el-form-item label="疲劳驾驶预警差值(秒)" prop="drowsyDrivingWarningDifference">
<el-input v-model="form.drowsyDrivingWarningDifference" clearable />
</el-form-item>
<el-form-item label="碰撞报警-碰撞时间(毫秒)" prop="collisionAlarmParamsCollisionAlarmTime">
<el-input v-model="form.collisionAlarmParams.collisionAlarmTime" clearable />
</el-form-item>
<el-form-item label="碰撞报警-碰撞加速度(0.1g)" prop="collisionAlarmParamsCollisionAcceleration">
<el-input v-model="form.collisionAlarmParams.collisionAcceleration" clearable />
</el-form-item>
<el-form-item label="侧翻报警参数-侧翻角度(度)" prop="rolloverAlarm">
<el-input v-model="form.rolloverAlarm" clearable />
</el-form-item>
</el-form>
<el-divider content-position="center">定时拍照控制</el-divider>
<el-form ref="form" size="mini" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
<el-form-item label="定时拍照开关-通道1" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.switchForChannel1" />
</el-form-item>
<el-form-item label="定时拍照开关-通道2" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.switchForChannel2" />
</el-form-item>
<el-form-item label="定时拍照开关-通道3" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.switchForChannel3" />
</el-form-item>
<el-form-item label="定时拍照开关-通道4" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.switchForChannel4" />
</el-form-item>
<el-form-item label="定时拍照开关-通道5" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.switchForChannel5" />
</el-form-item>
<el-form-item label="定时拍照存储-通道1" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.storageFlagsForChannel1" />
</el-form-item>
<el-form-item label="定时拍照存储-通道2" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.storageFlagsForChannel2" />
</el-form-item>
<el-form-item label="定时拍照存储-通道3" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.storageFlagsForChannel3" />
</el-form-item>
<el-form-item label="定时拍照存储-通道4" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.storageFlagsForChannel4" />
</el-form-item>
<el-form-item label="定时拍照存储-通道5" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.storageFlagsForChannel5" />
</el-form-item>
<el-form-item label="定时时间间隔" prop="timeInterval">
<el-input v-model="form.timeInterval" clearable />
</el-form-item>
<el-form-item label="定时时间单位" prop="rolloverAlarm">
<el-switch v-model="form.cameraTimer.timeUnit" active-text="分" inactive-text="秒" />
</el-form-item>
</el-form>
<div style="float: right;">
<el-button type="primary" @click="onSubmit">确认</el-button>
<el-button @click="showDevice">取消</el-button>
</div>
</el-main>
</el-container>
</div>
</template>
<script>
export default {
name: 'JTDeviceParam',
components: {
},
props: {
phoneNumber: {
type: String,
default: null
}
},
data() {
return {
form: {
collisionAlarmParams: {},
illegalDrivingPeriods: {},
cameraTimer: {}
},
rules: {
deviceId: [{ required: true, message: '请输入设备编号', trigger: 'blur' }]
},
isLoading: false
}
},
mounted() {
this.initData()
},
methods: {
initData: function() {
this.isLoading = true
this.$store.dispatch('jtDevice/queryConfig', this.phoneNumber)
.then((data) => {
this.form = data
})
.catch((e) => {
console.log(e)
})
.finally(() => {
this.isLoading = false
})
},
onSubmit: function() {
this.$store.dispatch('jtDevice/setConfig', {
phoneNumber: this.phoneNumber,
config: this.form
})
.then((data) => {
this.$message.success({
showClose: true,
message: '保存成功'
})
})
},
showDevice: function() {
this.$emit('show-device')
}
}
}
</script>

13
web/src/views/jtDevice/list.vue
View File

@ -3,8 +3,8 @@
<el-form :inline="true" size="mini"> <el-form :inline="true" size="mini">
<el-form-item> <el-form-item>
<el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="add">新设备</el-button> <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="add">新设备</el-button>
<el-button icon="el-icon-info" style="margin-right: 1rem;" @click="showInfo()">接入信息 <el-button icon="el-icon-info" style="margin-right: 1rem;" @click="showInfo()">接入信息</el-button>
</el-button></el-form-item> </el-form-item>
<el-form-item style="float: right;"> <el-form-item style="float: right;">
<el-button <el-button
icon="el-icon-refresh-right" icon="el-icon-refresh-right"
@ -84,8 +84,8 @@
终端参数</el-dropdown-item> 终端参数</el-dropdown-item>
<!-- <el-dropdown-item command="attribute" v-bind:disabled="!scope.row.status">--> <!-- <el-dropdown-item command="attribute" v-bind:disabled="!scope.row.status">-->
<!-- 终端属性</el-dropdown-item>--> <!-- 终端属性</el-dropdown-item>-->
<el-dropdown-item command="connection" :disabled="!scope.row.status"> <!-- <el-dropdown-item command="connection" :disabled="!scope.row.status">-->
终端连接</el-dropdown-item> <!-- 终端连接</el-dropdown-item>-->
<!-- <el-dropdown-item command="linkDetection" v-bind:disabled="!scope.row.status" >--> <!-- <el-dropdown-item command="linkDetection" v-bind:disabled="!scope.row.status" >-->
<!-- 链路检测</el-dropdown-item>--> <!-- 链路检测</el-dropdown-item>-->
<!-- <el-dropdown-item command="position" v-bind:disabled="!scope.row.status" >--> <!-- <el-dropdown-item command="position" v-bind:disabled="!scope.row.status" >-->
@ -213,6 +213,9 @@ export default {
console.log(row) console.log(row)
this.$emit('show-channel', row.id) this.$emit('show-channel', row.id)
}, },
showParam: function(row) {
this.$emit('show-param', row.phoneNumber)
},
add: function() { add: function() {
this.$refs.deviceEdit.openDialog(null, () => { this.$refs.deviceEdit.openDialog(null, () => {
this.$refs.deviceEdit.close() this.$refs.deviceEdit.close()
@ -226,7 +229,7 @@ export default {
}, },
moreClick: function(command, itemData) { moreClick: function(command, itemData) {
if (command === 'params') { if (command === 'params') {
this.$router.push(`/jtDeviceParams/${itemData.phoneNumber}`) this.showParam(itemData)
} else if (command === 'connection') { } else if (command === 'connection') {
// this.queryCloudRecords(itemData) // this.queryCloudRecords(itemData)
} else { } else {