[1078] 优化鉴权码位置，支持1078国标级联

src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonRecordInfo.java

@@ -11,4 +11,7 @@ public class CommonRecordInfo {
     // 结束时间
     private String endTime;
 
+    // 文件大小 单位byte
+    private String fileSize;
+
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java

@@ -2,15 +2,19 @@ package com.genersoft.iot.vmp.gb28181.bean;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.time.Instant;
 import java.util.List;
 
-/**    
+/**
- * @description:设备录像信息bean 
+ * @description:设备录像信息bean
  * @author: swwheihei
- * @date:   2020年5月8日 下午2:05:56     
+ * @date:   2020年5月8日 下午2:05:56
  */
+@Setter
+@Getter
 @Schema(description = "设备录像查询结果信息")
 public class RecordInfo {
 
@@ -36,67 +40,4 @@ public class RecordInfo {
 	@Schema(description = "")
 	private List<RecordItem> recordList;
 
-	public String getDeviceId() {
-		return deviceId;
-	}
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getSumNum() {
-		return sumNum;
-	}
-
-	public void setSumNum(int sumNum) {
-		this.sumNum = sumNum;
-	}
-
-	public List<RecordItem> getRecordList() {
-		return recordList;
-	}
-
-	public void setRecordList(List<RecordItem> recordList) {
-		this.recordList = recordList;
-	}
-
-	public String getChannelId() {
-		return channelId;
-	}
-
-	public void setChannelId(String channelId) {
-		this.channelId = channelId;
-	}
-
-	public String getSn() {
-		return sn;
-	}
-
-	public void setSn(String sn) {
-		this.sn = sn;
-	}
-
-	public Instant getLastTime() {
-		return lastTime;
-	}
-
-	public void setLastTime(Instant lastTime) {
-		this.lastTime = lastTime;
-	}
-
-	public int getCount() {
-		return count;
-	}
-
-	public void setCount(int count) {
-		this.count = count;
-	}
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java

@@ -44,7 +44,7 @@ public class RecordItem  implements Comparable<RecordItem>{
 	@Schema(description = "保密属性(必选)缺省为0;0:不涉密,1:涉密")
 	private int secrecy;
 
-	@Schema(description = "录像产生类型(可选)time或alarm 或 manua")
+	@Schema(description = "录像产生类型(可选)time或alarm 或 manual")
 	private String type;
 
 	@Schema(description = "录像触发者ID(可选)")

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/SourcePlaybackServiceForGbImpl.java

@@ -101,6 +101,7 @@ public class SourcePlaybackServiceForGbImpl implements ISourcePlaybackService {
                     CommonRecordInfo recordInfo = new CommonRecordInfo();
                     recordInfo.setStartTime(recordItem.getStartTime());
                     recordInfo.setEndTime(recordItem.getEndTime());
+                    recordInfo.setFileSize(recordItem.getFileSize());
                     recordInfoList.add(recordInfo);
                 }
                 callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), recordInfoList);

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java

@@ -1,13 +1,11 @@
 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd;
 
 import com.genersoft.iot.vmp.common.enums.ChannelDataType;
-import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
+import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.Platform;
 import com.genersoft.iot.vmp.gb28181.event.record.RecordInfoEventListener;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
+import com.genersoft.iot.vmp.gb28181.service.IGbChannelPlayService;
 import com.genersoft.iot.vmp.gb28181.service.IGbChannelService;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderForPlatform;
@@ -27,6 +25,8 @@ import javax.sip.RequestEvent;
 import javax.sip.SipException;
 import javax.sip.message.Response;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Component
@@ -40,6 +40,9 @@ public class RecordInfoQueryMessageHandler extends SIPRequestProcessorParent imp
     @Autowired
     private IGbChannelService channelService;
 
+    @Autowired
+    private IGbChannelPlayService playService;
+
     @Autowired
     private IDeviceService deviceService;
 
@@ -105,55 +108,105 @@ public class RecordInfoQueryMessageHandler extends SIPRequestProcessorParent imp
             }
             return;
         }
-        if (channel.getDataType() != ChannelDataType.GB28181) {
+        if (channel.getDataType() == ChannelDataType.GB28181) {
-            log.info("[平台查询录像记录] 只支持查询国标28181的录像数据 {}/{}", platform.getName(), channelId );
+            Device device = deviceService.getDevice(channel.getDataDeviceId());
-            try {
+            if (device == null) {
-                responseAck(request, Response.NOT_IMPLEMENTED); // 回复未实现
+                log.warn("[平台查询录像记录] 未找到通道对应的设备 {}/{}", platform.getName(), channelId );
-            } catch (SipException | InvalidArgumentException | ParseException e) {
+                try {
-                log.error("[命令发送失败] 平台查询录像记录: {}", e.getMessage());
+                    responseAck(request, Response.BAD_REQUEST);
+                } catch (SipException | InvalidArgumentException | ParseException e) {
+                    log.error("[命令发送失败] [平台查询录像记录] 未找到通道对应的设备: {}", e.getMessage());
+                }
+                return;
             }
-            return;
+            // 获取通道的原始信息
-        }
+            DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
-        Device device = deviceService.getDevice(channel.getDataDeviceId());
+            // 接收录像数据
-        if (device == null) {
+            recordInfoEventListener.addEndEventHandler(device.getDeviceId(), deviceChannel.getDeviceId(), (recordInfo)->{
-            log.warn("[平台查询录像记录] 未找到通道对应的设备 {}/{}", platform.getName(), channelId );
+                try {
+                    log.info("[国标级联] 录像查询收到数据， 通道： {}，准备转发===", channelId);
+                    cmderFroPlatform.recordInfo(channel, platform, request.getFromTag(), recordInfo);
+                } catch (SipException | InvalidArgumentException | ParseException e) {
+                    log.error("[命令发送失败] 国标级联 回复录像数据: {}", e.getMessage());
+                }
+            });
             try {
-                responseAck(request, Response.BAD_REQUEST);
+                commander.recordInfoQuery(device, deviceChannel.getDeviceId(), DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
-            } catch (SipException | InvalidArgumentException | ParseException e) {
+                        DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
-                log.error("[命令发送失败] [平台查询录像记录] 未找到通道对应的设备: {}", e.getMessage());
+                            // 回复200 OK
+                            try {
+                                responseAck(request, Response.OK);
+                            } catch (SipException | InvalidArgumentException | ParseException e) {
+                                log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
+                            }
+                        }),(eventResult -> {
+                            // 查询失败
+                            try {
+                                responseAck(request, eventResult.statusCode, eventResult.msg);
+                            } catch (SipException | InvalidArgumentException | ParseException e) {
+                                log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
+                            }
+                        }));
+            } catch (InvalidArgumentException | ParseException | SipException e) {
+                log.error("[命令发送失败] 录像查询: {}", e.getMessage());
             }
-            return;
+        }else {
-        }
+            // 回复200 OK
-        // 获取通道的原始信息
-        DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
-        // 接收录像数据
-        recordInfoEventListener.addEndEventHandler(device.getDeviceId(), deviceChannel.getDeviceId(), (recordInfo)->{
             try {
-                log.info("[国标级联] 录像查询收到数据， 通道： {}，准备转发===", channelId);
+                responseAck(request, Response.OK);
-                cmderFroPlatform.recordInfo(channel, platform, request.getFromTag(), recordInfo);
             } catch (SipException | InvalidArgumentException | ParseException e) {
-                log.error("[命令发送失败] 国标级联 回复录像数据: {}", e.getMessage());
+                log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
             }
-        });
+
-        try {
+            playService.queryRecord(channel, DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
-            commander.recordInfoQuery(device, deviceChannel.getDeviceId(), DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
+                    DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime),
-                    DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
+                    (code, msg, commonRecordInfoList) -> {
-                        // 回复200 OK
+                RecordInfo recordInfo = new RecordInfo();
-                        try {
+                recordInfo.setSumNum(commonRecordInfoList.size());
-                            responseAck(request, Response.OK);
+                recordInfo.setChannelId(channelId);
-                        } catch (SipException | InvalidArgumentException | ParseException e) {
+                recordInfo.setSn(sn + "");
-                            log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
+                List<RecordItem> recordList = new ArrayList<>(commonRecordInfoList.size());
-                        }
+                for (int i = 0; i < commonRecordInfoList.size(); i++) {
-                    }),(eventResult -> {
+                    CommonRecordInfo commonRecordInfo = commonRecordInfoList.get(i);
-                        // 查询失败
+                    RecordItem recordItem = new RecordItem();
-                        try {
+                    recordItem.setDeviceId(channelId);
-                            responseAck(request, eventResult.statusCode, eventResult.msg);
+                    recordItem.setName(commonRecordInfo.getStartTime());
-                        } catch (SipException | InvalidArgumentException | ParseException e) {
+                    recordItem.setFilePath("/" + commonRecordInfo.getStartTime());
-                            log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
+                    recordItem.setAddress("/" + commonRecordInfo.getStartTime());
-                        }
+                    recordItem.setStartTime(commonRecordInfo.getStartTime());
-                    }));
+                    recordItem.setEndTime(commonRecordInfo.getEndTime());
-        } catch (InvalidArgumentException | ParseException | SipException e) {
+                    recordItem.setSecrecy(0);
-            log.error("[命令发送失败] 录像查询: {}", e.getMessage());
+                    recordItem.setRecorderId("");
+                    recordItem.setType("");
+                    recordItem.setFileSize(commonRecordInfo.getFileSize());
+                    recordList.add(recordItem);
+                }
+                recordInfo.setRecordList(recordList);
+
+                try {
+                    log.info("[国标级联] 录像查询收到数据， 通道： {}，准备转发===", channelId);
+                    cmderFroPlatform.recordInfo(channel, platform, request.getFromTag(), recordInfo);
+                } catch (SipException | InvalidArgumentException | ParseException e) {
+                    log.error("[命令发送失败] 国标级联 回复录像数据: {}", e.getMessage());
+                }
+            });
         }
+//
+//
+//
+//
+//
+//
+//
+//        if (channel.getDataType() != ChannelDataType.GB28181) {
+//            log.info("[平台查询录像记录] 只支持查询国标28181的录像数据 {}/{}", platform.getName(), channelId );
+//            try {
+//                responseAck(request, Response.NOT_IMPLEMENTED); // 回复未实现
+//            } catch (SipException | InvalidArgumentException | ParseException e) {
+//                log.error("[命令发送失败] 平台查询录像记录: {}", e.getMessage());
+//            }
+//            return;
+//        }
+
     }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java

@@ -86,7 +86,6 @@ public class JTDevice {
                 ", 车牌颜色=" + plateColor +
                 ", 车牌='" + plateNo + '\'' +
                 ", 注册时间='" + registerTime + '\'' +
-                ", 鉴权码='" + authenticationCode + '\'' +
                 ", status=" + status +
                 '}';
     }

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

@@ -42,7 +42,6 @@ public class Jt808Decoder extends ByteToMessageDecoder {
 
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        in.retain();
         Session session = ctx.channel().attr(Session.KEY).get();
         log.info("> {} hex: 7e{}7e", session, ByteBufUtil.hexDump(in));
         try {
@@ -76,7 +75,6 @@ public class Jt808Decoder extends ByteToMessageDecoder {
             Re handler = CodecFactory.getHandler(header.getMsgId());
             if (handler == null) {
                 log.error("get msgId is null {}", header.getMsgId());
-                in.skipBytes(in.readableBytes());
                 buf.release();
                 return;
             }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java

@@ -91,7 +91,7 @@ public class J0100 extends Re {
             j8100.setResult(J8100.SUCCESS);
             String authenticationCode = UUID.randomUUID().toString();
             j8100.setCode(authenticationCode);
-            deviceForUpdate.setAuthenticationCode(authenticationCode);
+            session.setAuthenticationCode(authenticationCode);
             deviceForUpdate.setStatus(true);
             deviceForUpdate.setProvinceId(device.getProvinceId());
             deviceForUpdate.setRegisterTime(DateUtil.getNow());

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0102.java

@@ -42,15 +42,16 @@ public class J0102 extends Re {
 
     @Override
     protected Rs handler(Header header, Session session, Ijt1078Service service) {
-        JTDevice device = service.getDevice(header.getPhoneNumber());
         J8001 j8001 = new J8001();
         j8001.setRespNo(header.getSn());
         j8001.setRespId(header.getMsgId());
-        if (device == null || !device.getAuthenticationCode().equals(authenticationCode)) {
+        if (session.getAuthenticationCode() == null ||
+                !session.getAuthenticationCode().equals(authenticationCode)) {
             j8001.setResult(J8001.FAIL);
         }else {
             j8001.setResult(J8001.SUCCESS);
-            if (!device.isStatus()) {
+            JTDevice device = service.getDevice(header.getPhoneNumber());
+            if (device != null && !device.isStatus()) {
                 deviceForUpdate = device;
                 deviceForUpdate.setStatus(true);
                 service.updateDevice(device);

src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/SourceDownloadServiceForJTImpl.java

@@ -1,28 +0,0 @@
-package com.genersoft.iot.vmp.jt1078.service.impl;
-
-import com.genersoft.iot.vmp.common.InviteSessionType;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.common.enums.ChannelDataType;
-import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
-import com.genersoft.iot.vmp.gb28181.service.IPlayService;
-import com.genersoft.iot.vmp.gb28181.service.ISourceDownloadService;
-import com.genersoft.iot.vmp.service.bean.ErrorCallback;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service(ChannelDataType.DOWNLOAD_SERVICE + ChannelDataType.JT_1078)
-public class SourceDownloadServiceForJTImpl implements ISourceDownloadService {
-
-
-    @Override
-    public void download(CommonGBChannel channel, Long startTime, Long stopTime, Integer downloadSpeed, ErrorCallback<StreamInfo> callback) {
-
-    }
-
-    @Override
-    public void stopDownload(CommonGBChannel channel, String stream) {
-
-    }
-}

src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/SourcePlaybackServiceForJTImpl.java

@@ -49,8 +49,8 @@ public class SourcePlaybackServiceForJTImpl implements ISourcePlaybackService {
         Assert.notNull(device, "设备不存在");
         jt1078Template.checkTerminalStatus(device.getPhoneNumber());
 
-        playService.playback(device.getPhoneNumber(), jtChannel.getChannelId(), DateUtil.timestampMsTo_yyyy_MM_dd_HH_mm_ss(startTime),
+        playService.playback(device.getPhoneNumber(), jtChannel.getChannelId(), DateUtil.timestampTo_yyyy_MM_dd_HH_mm_ss(startTime),
-                DateUtil.timestampMsTo_yyyy_MM_dd_HH_mm_ss(stopTime), 0, 0, 0, 0, result -> {
+                DateUtil.timestampTo_yyyy_MM_dd_HH_mm_ss(stopTime), 0, 0, 0, 0, result -> {
                     callback.run(result.getCode(), result.getMsg(), result.getData());
                 });
     }
@@ -123,6 +123,7 @@ public class SourcePlaybackServiceForJTImpl implements ISourcePlaybackService {
             CommonRecordInfo commonRecordInfo = new CommonRecordInfo();
             commonRecordInfo.setStartTime(jRecordItem.getStartTime());
             commonRecordInfo.setEndTime(jRecordItem.getEndTime());
+            commonRecordInfo.setFileSize(jRecordItem.getSize() + "");
             recordInfoList.add(commonRecordInfo);
         }
         callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), recordInfoList);

src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java

@@ -5,6 +5,7 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.util.AttributeKey;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.net.InetSocketAddress;
@@ -35,6 +36,11 @@ public class Session {
     @Getter
     private String phoneNumber;
 
+    // 设备手机号
+    @Setter
+    @Getter
+    private String authenticationCode;
+
     // 创建时间
     @Getter
     private final long creationTime;

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManager.java

@@ -257,7 +257,6 @@ public class ZLMMediaServerStatusManager {
         String hookPrefix = String.format("%s://%s:%s%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort, (serverServletContextPath == null || "/".equals(serverServletContextPath)) ? "" : serverServletContextPath);
 
         Map<String, Object> param = new HashMap<>();
-        param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
         if (mediaServerItem.getRtspPort() != 0) {
             param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
         }

web/src/store/modules/commonChanel.js

@@ -544,7 +544,7 @@ const actions = {
   },
   seekPlayback({ commit }, params) {
     return new Promise((resolve, reject) => {
-      resumePlayback(params).then(response => {
+      seekPlayback(params).then(response => {
         const { data } = response
         resolve(data)
       }).catch(error => {

web/src/views/jtDevice/channel/record.vue

@@ -461,12 +461,9 @@ export default {
         }
       }
       if (this.streamInfo !== null) {
-        this.stopPlayRecord(() => {
+        this.stopPlayRecord()
-          this.downloadFile(row)
-        })
-      } else {
-        this.downloadRecord(row)
       }
+      this.downloadRecord(row)
     },
     downloadRecord: function(row) {
       const loading = this.$loading({

web/src/views/jtDevice/channel/record2.vue

@@ -1,485 +0,0 @@
-<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>

数据库/2.7.4/初始化-mysql-2.7.4.sql

@@ -477,7 +477,6 @@ create table IF NOT EXISTS wvp_jt_terminal (
                                  model character varying(50),
                                  plate_color character varying(50),
                                  plate_no character varying(50),
-                                 authentication_code character varying(255),
                                  longitude double precision,
                                  latitude double precision,
                                  status bool default false,

数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql

@@ -478,7 +478,6 @@ create table IF NOT EXISTS wvp_jt_terminal (
                                  model character varying(50),
                                  plate_color character varying(50),
                                  plate_no character varying(50),
-                                 authentication_code character varying(255),
                                  longitude double precision,
                                  latitude double precision,
                                  status bool default false,

数据库/2.7.4/更新-mysql-2.7.4.sql

@@ -11,7 +11,6 @@ create table IF NOT EXISTS wvp_jt_terminal (
                                  model character varying(50),
                                  plate_color character varying(50),
                                  plate_no character varying(50),
-                                 authentication_code character varying(255),
                                  longitude double precision,
                                  latitude double precision,
                                  status bool default false,

数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql

@@ -11,7 +11,6 @@ create table IF NOT EXISTS wvp_jt_terminal (
                                  model character varying(50),
                                  plate_color character varying(50),
                                  plate_no character varying(50),
-                                 authentication_code character varying(255),
                                  longitude double precision,
                                  latitude double precision,
                                  status bool default false,