fix():

王鑫
1 parent ff6c5ef5
Showing 14 changed files with 314 additions and 129 deletions
src/main/java/com/genersoft/iot/vmp/TCPClient.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/FtpConfigBean.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/Jt1078ConfigBean.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/TuohuaConfigBean.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/service/impl/Jt1078OfServiceImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
src/main/java/com/genersoft/iot/vmp/vmanager/util/FTPUtils.java
src/main/java/com/genersoft/iot/vmp/vmanager/util/FtpUtils.java
src/main/resources/application-dev100.yml
src/main/resources/application-local.yml
web_src/src/components/HistoricalRecord.vue
web_src/src/components/JT1078Components/historical/HistoricalDataTree.vue
@@ -13,17 +13,10 @@ public class TCPClient {
         //获取输入流
         InputStream is = socket.getInputStream();
         // 将要传递给server的字符串参数转换称byte数组，并将数组写入到输出流中
-        os.write(new String("hello world").getBytes());
-        int ch = 0;
-        byte[] buff = new byte[1024];
-        // buff主要用来读取输入的内容，存成byte数组，ch主要用来获取读取数组的长度(与服务端作用相同）
-        ch = is.read(buff);
-        //将接收流的byte数组转换成字符串，这里是从服务端回发的字符串参数的长度
-        String content = new String(buff,0,ch);
-        System.out.println(content);
-        //一定要关闭输入输出流及socket
-        is.close();
-        os.close();
-        socket.close();
+        while(true){
+            os.write(new String("hello world").getBytes());
+            os.flush();
+            Thread.sleep(1000);
+        }
     }
 }
@@ -7,6 +7,7 @@ import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
 import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
 import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -684,7 +685,11 @@ public class ZLMHttpHookListener {
             if (object == null) {
                 String[] split = param.getStream().split("_");
                 if (split != null && split.length == 2) {
-                    jt1078OfCarController.clearMap(split[1],split[0]);
+                    try {
+                        jt1078OfCarController.clearMap(split[1],split[0]);
+                    } catch (ServiceException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
             }
         }
@@ -12,6 +12,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.StreamProxyTask;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
 import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
 import com.genersoft.iot.vmp.jtt1078.app.VideoServerApp;
@@ -149,6 +150,20 @@ public class Jt1078OfCarController {
     }
+    @GetMapping("/history/uploading/{stream}")
+    public void uploading(@PathVariable String stream) {
+        try {
+            String url = StringUtils.replace(jt1078ConfigBean.getJt1078Url(), "{0}", this.jt1078ConfigBean.getHistoryUpload());
+            String msg = jt1078ConfigBean.formatMessageHistoryUpload(stream);
+            HttpClientPostEntity httpClientPost = this.httpClientUtil.doPost(url, msg, (String) null);
+            chooseEntity(httpClientPost, url, false);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
     /**
      * redis清除在线车辆
      */
@@ -349,7 +364,6 @@ public class Jt1078OfCarController {
      * @param stream 流唯一标识
      */
     public void sendIORequest(String stream) {
-
         threadPoolExecutor.execute(() -> {
             String msg = null;
             // http://192.168.168.241:8100/device/{0} 指令下发地址
@@ -669,7 +683,7 @@ public class Jt1078OfCarController {
                                                       @PathVariable @NotBlank(message = "channel 不能为空") String channel,
                                                       @PathVariable @NotBlank(message = "开始时间不能为空") String startTime,
                                                       @PathVariable @NotBlank(message = "结束时间不能为空") String endTime,
-                                                      String channelMapping, HttpServletRequest request) {
+                                                      @PathVariable String channelMapping, HttpServletRequest request) throws ServiceException {
         String header = request.getHeader("access-token");
         JwtUser jwtUser = JwtUtils.verifyToken(header);
         String key = StringUtils.join(new String[]{"history:", sim, "-", channel});
@@ -685,7 +699,6 @@ public class Jt1078OfCarController {
         Integer historyPort = createHistoryPort(channelMapping);
         channelMapping = StringUtils.join(new String[]{channelMapping,"_", String.valueOf(historyPort)});
         this.redisTemplate.opsForValue().set(key, channelMapping, 1L, TimeUnit.HOURS);
-//            PublishManager.getInstance().open(channelMapping);
         StreamContent streamContent = this.getStreamContentPlayURL(StringUtils.join(new String[]{channelMapping}));
         if (Objects.nonNull(streamContent) && StringUtils.isNotEmpty(streamContent.getWs_flv())) {
             resultMap.put("code", "1");
@@ -698,8 +711,7 @@ public class Jt1078OfCarController {
         String msg = null;
         String url = StringUtils.replace(this.jt1078ConfigBean.getJt1078Url(), "{0}", this.jt1078ConfigBean.getPlayHistoryPort());
         try {
-            Integer httpPort = this.jt1078ConfigBean.getHttpPort();
-            HttpClientPostEntity entity = this.createServerLister(channelMapping, historyPort, httpPort);
+            HttpClientPostEntity entity = this.createServerLister(channelMapping, historyPort, historyPort);
             if (Objects.isNull(entity)) {
                 resultMap.put("code", "-20");
                 resultMap.put("msg", "新建链接错误，请稍后再试");
@@ -763,7 +775,7 @@ public class Jt1078OfCarController {
      * 遍历Map，寻找第一个不包含指定string的Set<String>，
      * 将该string添加到Set中并返回对应的key，如果没有找到则返回null。
      */
-    private Integer addStringToFirstNonContainingSet(String targetString) {
+    private Integer addStringToFirstNonContainingSet(String targetString) throws ServiceException {
         // 使用entrySet()方法直接获取键值对进行迭代，效率更高
         for (Map.Entry<Integer, Set<String>> entry : map.entrySet()) {
             Set<String> set = entry.getValue();
@@ -774,11 +786,10 @@ public class Jt1078OfCarController {
             String secondDashValue = getSecondDashValue(targetString);
             String findSet = getFindSet(set, secondDashValue);
             set.add(targetString);
-            if (secondDashValue != null && findSet == null) {
-                return entry.getKey(); // 立即返回对应的key，不再继续查找
-            } else {
+            if (secondDashValue == null || findSet != null) {
                 clearMap(String.valueOf(entry.getKey()), findSet);
             }
+            return entry.getKey(); // 立即返回对应的key，不再继续查找
         }
         return null; // 如果所有Set都包含目标字符串，则返回null
     }
@@ -786,7 +797,7 @@ public class Jt1078OfCarController {
     /**
      * 清理map中的值
      */
-    public void clearMap(String key, String value) {
+    public void clearMap(String key, String value) throws ServiceException {
         if (StringUtils.isNotBlank(key) && StringUtils.isNotBlank(value)) {
             Set<String> strings = map.get(Integer.valueOf(key));
             if (strings == null) {
@@ -800,7 +811,15 @@ public class Jt1078OfCarController {
                     throw new RuntimeException(e);
                 }
                 String[] split = value.split("-");
-                stopHistory(split[1], split[0]);
+                Map<String, Object> stringObjectMap = stopHistory(split[1], split[0]);
+                while (true){
+                    if (stringObjectMap.get("code").equals("1")){
+                        log.info("{} 历史视频断流成功",value);
+                        break;
+                    }else {
+                        throw new ServiceException(String.format(" %s 历史视频断流失败",value));
+                    }
+                }
                 strings.remove(value);
             }
         } else {
@@ -813,7 +832,7 @@ public class Jt1078OfCarController {
      *
      * @param key 通道唯一值
      */
-    public Integer createHistoryPort(String key) {
+    public Integer createHistoryPort(String key) throws ServiceException {
         Integer port = addStringToFirstNonContainingSet(key);
         if (port == null) {
             throw new RuntimeException(String.format("[ %s ]通道观看人数太多,请等待 !!!", key));
@@ -879,7 +898,6 @@ public class Jt1078OfCarController {
     /**
      * 获取视频播放地址
-     *
      * @param stream 流名称
      * @return 流信息
      */
@@ -1007,7 +1025,6 @@ public class Jt1078OfCarController {
     }
     private void chooseEntity(HttpClientPostEntity entity, String url, boolean flag) {
-        Map<String, Object> result = new HashMap();
         if (Objects.isNull(entity)) {
             throw new ControllerException(ErrorCode.ERROR301);
         } else {
@@ -15,35 +15,37 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ConfigurationProperties(prefix = "ftp")
 public class FtpConfigBean {
-
-    private String basePath;
+    /**
+     * 基础地址
+     */
+    private String basePath = "/wvp-local";
     /**
      * ftp地址
      */
-    private String host;
-    private String httpPath;
+    private String host = "192.168.169.100";
+    private String httpPath = "ftp://192.168.169.100";
     /**
      *
      */
-    private String filePathPrefix;
+    private String filePathPrefix = "http://192.168.169.100:10021/wvp-local";
     /**
      * 密码
      */
-    private String password;
+    private String password = "ftp@123";
     /**
      * 端口
      */
-    private Integer port;
+    private Integer port = 10021;
     /**
      * 用户名
      */
-    private String username;
+    private String username = "ftpadmin";
     /**
      * 失败重试次数 -1为一直重试
      */
-    private Integer retryTimes;
+    private Integer retryTimes = 5;
     /**
      * 失败重试间隔时间
      */
-    private Integer retryWaitTimes;
+    private Integer retryWaitTimes = 3000;
 }
-package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;


@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @Value("${tuohua.bsth.jt1078.playHistoryPort}")
    private String playHistoryPort;

    @Value("${tuohua.bsth.jt1078.ports}")
    private String portsOf1078;

    @Value("${tuohua.bsth.jt1078.pushURL}")
    private String pushURL;

    @Value("${tuohua.bsth.jt1078.stopPushURL}")
    private String stopPUshURL;

    private Integer start1078Port;

    private Integer end1078Port;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.downloadFLV}")
    private String downloadFlv;

    @Value("${tuohua.bsth.jt1078.port}")
    private Integer port;

    @Value("${tuohua.bsth.jt1078.httpPort}")
    private Integer httpPort;

    @Value("${spring.profiles.active}")
    private String profilesActive;

    @Value("${media.pushKey}")
    private String pushKey;

    @Resource
    private RedisTemplate<String, Integer> redisTemplate;

    public Integer getPort() {
        if (port == null) {
            return 30000;
        }
        return port;
    }

    public Integer getHttpPort() {
        if (httpPort == null) {
            return 30000;
        }
        return httpPort;
    }

    private Integer getIntPort() {
        return profilesActive.equals("wx-local") ? 10000 : 0;
    }

    @PostConstruct
    public void initMap() {
        Set<String> historyPortKeys = redisTemplate.keys("history:port:*");
        Set<String> keys = redisTemplate.keys("tag:*");
        Set<String> patrolKeys = redisTemplate.keys("patrol:stream:*");
        if (!historyPortKeys.isEmpty()) {
            keys.addAll(historyPortKeys);
        }
        if (!patrolKeys.isEmpty()) {
            keys.addAll(patrolKeys);
        }
        if (keys != null) {
            redisTemplate.delete(keys);
        }
        Map<Integer, Set<String>> hashMap = new HashMap<>();
        for (int number = getStart1078Port(); number <= getEnd1078Port(); number++) {
            hashMap.put(number, new HashSet<>());
        }
        Jt1078OfCarController.map.putAll(hashMap);
    }

    private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";

    private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";

    private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";

    private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";

    public String formatMessageId(String sim, String channel, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":1,\"storageType\":0,\"channelNo\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{sim}", sim);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageHistoryStopRTSP(String sim, String channel, RtspConfigBean configBean) {
        String msg = StringUtils.replace("{\"playbackMode\":2,\"channelNo\":{channelNo},\"playbackSpeed\":0,\"clientId\":\"{sim}\"}", "{sim}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.pushURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatStopPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream) {
        String url = StringUtils.replace(getGetURL(), "{stream}", stream);
        if (!StringUtils.endsWith(url, ".flv")) {
            url = url + ".flv";
        }
        return url;
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getPushKey(){
        if (Objects.isNull(this.pushKey)){
            this.pushKey = "?callId=41db35390ddad33f83944f44b8b75ded";
        }
        return "?callId="+this.pushKey;
    }
    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }

    public String getDownloadFlv() {
        return downloadFlv;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;

import com.genersoft.iot.vmp.vmanager.jt1078.platform.Jt1078OfCarController;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;

@Data
@Component
public class Jt1078ConfigBean {
    @Value("${tuohua.bsth.jt1078.url}")
    private String jt1078Url;

    @Value("${tuohua.bsth.jt1078.sendPort}")
    private String jt1078SendPort;

    @Value("${tuohua.bsth.jt1078.stopSendPort}")
    private String stopSendPort;

    @Value("${tuohua.bsth.jt1078.historyListPort}")
    private String historyListPort;

    @Value("${tuohua.bsth.jt1078.history_upload}")
    private String historyUpload = "9206";

    @Value("${tuohua.bsth.jt1078.playHistoryPort}")
    private String playHistoryPort;

    @Value("${tuohua.bsth.jt1078.ports}")
    private String portsOf1078;

    @Value("${tuohua.bsth.jt1078.pushURL}")
    private String pushURL;

    @Value("${tuohua.bsth.jt1078.stopPushURL}")
    private String stopPUshURL;

    private Integer start1078Port;

    private Integer end1078Port;

    @Value("${tuohua.bsth.jt1078.get.url}")
    private String getURL;

    @Value("${tuohua.bsth.jt1078.addPortVal}")
    private Integer addPort;

    @Value("${tuohua.bsth.jt1078.ws}")
    private String ws;

    @Value("${tuohua.bsth.jt1078.wss}")
    private String wss;

    @Value("${tuohua.bsth.jt1078.downloadFLV}")
    private String downloadFlv;

    @Value("${tuohua.bsth.jt1078.port}")
    private Integer port;

    @Value("${tuohua.bsth.jt1078.httpPort}")
    private Integer httpPort;

    @Value("${spring.profiles.active}")
    private String profilesActive;

    @Value("${media.pushKey}")
    private String pushKey;

    @Resource
    private RedisTemplate<String, Integer> redisTemplate;

    @Resource
    private FtpConfigBean ftpConfigBean;

    public Integer getPort() {
        if (port == null) {
            return 30000;
        }
        return port;
    }

    public Integer getHttpPort() {
        if (httpPort == null) {
            return 30000;
        }
        return httpPort;
    }

    private Integer getIntPort() {
        return profilesActive.equals("wx-local") ? 10000 : 0;
    }

    @PostConstruct
    public void initMap() {
        Set<String> historyPortKeys = redisTemplate.keys("history:port:*");
        Set<String> keys = redisTemplate.keys("tag:*");
        Set<String> patrolKeys = redisTemplate.keys("patrol:stream:*");
        if (!historyPortKeys.isEmpty()) {
            keys.addAll(historyPortKeys);
        }
        if (!patrolKeys.isEmpty()) {
            keys.addAll(patrolKeys);
        }
        if (keys != null) {
            redisTemplate.delete(keys);
        }
        Map<Integer, Set<String>> hashMap = new HashMap<>();
        for (int number = getStart1078Port(); number <= getEnd1078Port(); number++) {
            hashMap.put(number, new HashSet<>());
        }
        Jt1078OfCarController.map.putAll(hashMap);
    }

    private static final String SEND_IO_MESSAGE_RTSP = "{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}";

    private static final String SEND_IO_MESSAGE_RTSP_STOP = "{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}";

    private static final String SEND_IO_HISTORY_RTSP = "{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"channelId\":{channelNo}}";

    private static final String SEND_IO_PLAY_RTSP = "{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}";

    public String formatMessageId(String sim, String channel, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{ \"messageId\": 37121, \"properties\": 0, \"clientId\": \"{clientId}\", \"serialNo\": \"1\", \"ip\": \"{ip}\", \"tcpPort\": \"{tcpPort}\", \"udpPort\": \"{udpPort}\", \"channelNo\": \"{channelNo}\", \"mediaType\": \"1\", \"streamType\": \"1\"}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageStop(String sim, String channel) {
        String msg = StringUtils.replace("{\"messageId\": 37122,\"properties\": 0,\"clientId\": \"{clientId}\",\"serialNo\": \"1\",\"channelNo\": \"{channelNo}\",\"command\": \"0\",\"closeType\": \"0\",\"streamType\": \"1\"}", "{clientId}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryListRTSP(String sim, String channel, String startTime, String endTime) {
        String msg = StringUtils.replace("{\"msgid\":37381,\"clientId\":\"{clientId}\",\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"mediaType\":0,\"streamType\":1,\"storageType\":0,\"channelNo\":{channelNo}}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatMessageHistoryPlayRTSP(String sim, String channel, String startTime, String endTime, RtspConfigBean configBean, Integer port) {
        String msg = StringUtils.replace("{\"ip\":\"{ip}\",\"tcpPort\":{tcpPort},\"udpPort\":{udpPort},\"channelNo\":\"{channelNo}\",\"mediaType\":0,\"streamType\":0,\"storageType\":0,\"playbackType\":0,\"playbackSpeed\":1,\"startTime\":\"{startTime}\",\"endTime\":\"{endTime}\",\"clientId\":\"{sim}\",\"messageId\":37377}", "{clientId}", sim);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        msg = StringUtils.replace(msg, "{endTime}", endTime);
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{tcpPort}", (port.intValue() + getIntPort() +getAddPort()) + "");
        msg = StringUtils.replace(msg, "{udpPort}", (port.intValue() + getIntPort() + getAddPort()) + "");
        msg = StringUtils.replace(msg, "{sim}", sim);
        return StringUtils.replace(msg, "{ip}", configBean.getRtspIp());
    }

    public String formatMessageHistoryUpload(String stream) {
        if (StringUtils.isBlank(stream)) {
            throw new RuntimeException("上传参数不能为空");
        }
        String[] split = stream.split("_");
        if (split.length < 4){
            throw new RuntimeException("上传参数异常, 请联系管理员");
        }
        String sim = split[0];
        String channel = split[1];
        String startTime = split[2];
        String endTime = split[3];
        String msg = StringUtils.replace("{\n" +
                "  \"clientId\": \"{clientId}\",\n" +
                "  \"ip\": \"{ip}\",\n" +
                "  \"port\": {port},\n" +
                "  \"username\": \"{username}\",\n" +
                "  \"password\": \"{password}\",\n" +
                "  \"path\": \"{path}\",\n" +
                "  \"channelNo\": {channel},\n" +
                "  \"startTime\": \"{startTime}\",\n" +
                "  \"endTime\": \"{endTime}\",\n" +
                "  \"mediaType\": 0,\n" +
                "  \"streamType\": 1,\n" +
                "  \"storageType\": 1,\n" +
                "  \"condition\": 6\n" +
                "}","{clientId}",sim);
        msg = StringUtils.replace(msg, "{ip}", ftpConfigBean.getHost());
        msg = StringUtils.replace(msg, "{port}", ftpConfigBean.getPort().toString());
        msg = StringUtils.replace(msg, "{username}", channel);
        msg = StringUtils.replace(msg, "{password}", ftpConfigBean.getPassword());
        msg = StringUtils.replace(msg, "{path}", StringUtils.join(ftpConfigBean.getBasePath(),"/",sim,"/channel_",channel));
        msg = StringUtils.replace(msg, "{channelNo}", channel);
        msg = StringUtils.replace(msg, "{startTime}", startTime);
        return StringUtils.replace(msg, "{endTime}", endTime);
    }

    public String formatMessageHistoryStopRTSP(String sim, String channel, RtspConfigBean configBean) {
        String msg = StringUtils.replace("{\"playbackMode\":2,\"channelNo\":{channelNo},\"playbackSpeed\":0,\"clientId\":\"{sim}\"}", "{sim}", sim);
        return StringUtils.replace(msg, "{channelNo}", channel);
    }

    public String formatPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.pushURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatStopPushURL(String pushKey, int port, int httpPort) {
        String msg = StringUtils.replace(this.stopPUshURL, "{pushKey}", pushKey);
        msg = StringUtils.replace(msg, "{port}", String.valueOf(port));
        return StringUtils.replace(msg, "{httpPort}", String.valueOf(httpPort));
    }

    public String formatVideoURL(String stream) {
        String url = StringUtils.replace(getGetURL(), "{stream}", stream);
        if (!StringUtils.endsWith(url, ".flv")) {
            url = url + ".flv";
        }
        return url;
    }

    public String getJt1078Url() {
        return this.jt1078Url;
    }

    public String getJt1078SendPort() {
        return this.jt1078SendPort;
    }

    public String getStopSendPort() {
        return this.stopSendPort;
    }

    public String getHistoryListPort() {
        return this.historyListPort;
    }

    public String getPlayHistoryPort() {
        return this.playHistoryPort;
    }

    public String getPushURL() {
        return this.pushURL;
    }

    public Integer getStart1078Port() {
        if (Objects.isNull(this.start1078Port))
            this.start1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringBefore(this.portsOf1078, ",")));
        return this.start1078Port;
    }

    public Integer getEnd1078Port() {
        if (Objects.isNull(this.end1078Port))
            this.end1078Port = Integer.valueOf(Integer.parseInt(StringUtils.substringAfter(this.portsOf1078, ",")));
        return this.end1078Port;
    }

    public String getPushKey(){
        if (Objects.isNull(this.pushKey)){
            this.pushKey = "?callId=41db35390ddad33f83944f44b8b75ded";
        }
        return "?callId="+this.pushKey;
    }
    public String getStopPUshURL() {
        return this.stopPUshURL;
    }

    public String getGetURL() {
        return this.getURL;
    }

    public Integer getAddPort() {
        return this.addPort;
    }

    public String getWs() {
        return this.ws;
    }

    public String getWss() {
        return this.wss;
    }

    public String getDownloadFlv() {
        return downloadFlv;
    }

    public String getPortsOf1078() {
        return portsOf1078;
    }
}
 \ No newline at end of file
@@ -159,14 +159,18 @@ public class TuohuaConfigBean {
         }
         return (List<HashMap>) JSON.parseArray(postEntity.getResultStr(), HashMap.class);
     }
-
+    /**
+     * 修改测试号
+     * @param json
+     */
     public void setMap(String json){
         List<CarData> carData = JSON.parseArray(json, CarData.class);
         int count = 1;
         if (CollectionUtils.isNotEmpty(carData)) {
             if (StringUtils.equals(profileActive, "wx-local")) {
                 CarData value = carData.get(0);
-                value.setSim("123456789011");
+                value.setSim("13800009998");
+//                value.setSim("123456789011");
                 map.put(value.getSim(), value);
             }else {
                 for (CarData carDatum : carData) {
@@ -315,10 +319,9 @@ public class TuohuaConfigBean {
         hashMap.put("abnormalStatus",abnormalStatus);
         if (StringUtils.equals(profileActive, "wx-local")) {
-            hashMap.put("sim","123456789011");
-//            hashMap.put("sim", "122223333444");
+            hashMap.put("sim","13800009998");
+//            hashMap.put("sim", "123456789011");
         }
-//
         return hashMap;
     }
@@ -32,8 +32,8 @@ public class Jt1078OfServiceImpl implements Jt1078OfService {
     @Override
     public List<CarTreeData> getCarTreeData() {
         try {
-            String lineJson = tohuaConfigBean.requestLine(httpClientUtil, String.valueOf(100));
-            String carJson = tohuaConfigBean.requestCars(httpClientUtil, String.valueOf(100));
+//            String lineJson = tohuaConfigBean.requestLine(httpClientUtil, String.valueOf(100));
+//            String carJson = tohuaConfigBean.requestCars(httpClientUtil, String.valueOf(100));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -71,7 +71,6 @@ public class StreamProxyController {
                                           @RequestParam(required = false)Integer count,
                                           @RequestParam(required = false)String query,
                                           @RequestParam(required = false)Boolean online ){
-
         return streamProxyService.getAll(page, count);
     }
-package com.genersoft.iot.vmp.vmanager.util;
-
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.FtpConfigBean;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPReply;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * FTP工具类
- *
- * @Author WangXin
- * @Data 2025/2/11
- * @Version 1.0.0
- */
-@Log4j2
-@Component
-public class FTPUtils {
-
-    @Resource
-    private FtpConfigBean ftpConfigBean;
-
-    private FTPClient connectFtpServer() {
-        FTPClient ftpClient = new FTPClient();
-        ftpClient.setConnectTimeout(1000 * 60);
-        ftpClient.setControlEncoding("utf-8");
-        ftpClient.enterLocalPassiveMode();
-
-        int retryTimes = ftpConfigBean.getRetryTimes(); // 假设getRetryTimes方法返回int类型的重试次数，-1表示无限重试
-        boolean isConnected = false;
-        int attempts = 0;
-
-        while (!isConnected && (retryTimes == -1 || attempts < retryTimes)) {
-            try {
-                int replyCode;
-                ftpClient.connect(ftpConfigBean.getHost());
-                ftpClient.login(ftpConfigBean.getUsername(), ftpConfigBean.getPassword());
-                replyCode = ftpClient.getReplyCode();
-
-                if (!FTPReply.isPositiveCompletion(replyCode)) {
-                    log.info("连接FTP服务器 {} 失败", ftpConfigBean.getHost());
-                    ftpClient.disconnect();
-                    attempts++;
-                    if (retryTimes != -1) {
-                        log.info("第 {} 次尝试连接失败, 将重新连接", attempts);
-                    }
-                    continue; // 连接不成功，继续循环
-                }
-                isConnected = true;
-                log.info("replyCode:{}", replyCode);
-            } catch (IOException e) {
-                log.error("连接失败: {}", e.toString());
-                attempts++;
-                if (retryTimes != -1) {
-                    log.info("第 {} 次尝试连接失败, 错误信息: {}", attempts, e.getMessage());
-                }
-                try {
-                    // 等待一段时间再重试
-                    Thread.sleep(ftpConfigBean.getRetryWaitTimes());
-                } catch (InterruptedException ie) {
-                    Thread.currentThread().interrupt();
-                }
-            }
-        }
-        if (!isConnected) {
-            log.error("无法连接到FTP服务器，已达到最大重试次数");
-            return null;
-        }
-        return ftpClient;
-    }
-}
+package com.genersoft.iot.vmp.vmanager.util;
+
+import cn.hutool.extra.ftp.FtpException;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.FtpConfigBean;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.SocketException;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * FTP服务工具类
+ */
+@Log4j2
+@Component
+@RequiredArgsConstructor
+public class FtpUtils {
+
+    private final FtpConfigBean ftpConfigBean;
+
+    /**
+     * 获取 FTPClient对象
+     * @return FTPClient对象
+     */
+    private FTPClient getFTPClient() {
+        /**
+         * 创建 FTPClient对象（对于连接ftp服务器，以及上传和上传都必须要用到一个对象）
+         */
+        try {
+            FTPClient ftpClient = new FTPClient();
+            /**
+             * 连接 FTP服务
+             */
+            // 设置编码
+            ftpClient.setControlEncoding("UTF-8");
+            // 设置连接超时时间(单位：毫秒)
+            ftpClient.setConnectTimeout(10 * 1000);
+            // 连接
+            ftpClient.connect(ftpConfigBean.getHost(), ftpConfigBean.getPort());
+            // 登录
+            ftpClient.login(ftpConfigBean.getUsername(), ftpConfigBean.getPassword());
+            /**
+             * ftpClient.getReplyCode()：接受状态码(如果成功，返回230，如果失败返回503)
+             * FTPReply.isPositiveCompletion()：如果连接成功返回true，否则返回false
+             */
+            if (!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
+                log.error("未连接到FTP服务，用户名或密码错误");
+                // 连接失败，断开连接
+                ftpClient.disconnect();
+                return null;
+            } else {
+                log.info("连接到FTP服务成功");
+                // 设置二进制方式传输文件
+                ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
+                // 设置被动工作模式，文件传输端口设置,否则文件上传不成功，也不报错
+                ftpClient.enterLocalPassiveMode();
+            }
+            return ftpClient;
+        } catch (SocketException e) {
+            log.error("FTP的IP地址错误，请正确配置。");
+            throw new FtpException("FTP的IP地址错误，请正确配置。");
+        } catch (IOException e) {
+            log.error("FTP的端口错误，请正确配置。");
+            throw new FtpException("FTP的端口错误，请正确配置。");
+        } catch (Exception e) {
+            log.error("获取ftp客户端异常");
+            throw new FtpException("获取ftp客户端异常");
+        }
+    }
+
+    /**
+     * 断开 FTPClient对象
+     */
+    private void closeConnect(FTPClient ftpClient) {
+        try {
+            if (ftpClient != null && ftpClient.isConnected()) {
+                ftpClient.logout();
+                // 断开ftp的连接
+                ftpClient.disconnect();
+                log.info("关闭ftp客户端成功");
+            }
+        } catch (Exception e) {
+            log.error("关闭ftp客户端异常");
+            throw new FtpException("关闭ftp客户端异常");
+        }
+    }
+
+    /**
+     * 创建文件夹
+     * @param ftpBasePath FTP用户上传的根目录
+     * @param dirPath     需要创建的文件夹，多层使用/隔开
+     * @return
+     */
+    public boolean createDirectory(String ftpBasePath, String dirPath) {
+        FTPClient ftpClient = getFTPClient();
+        try {
+            /**
+             * 切换到ftp的服务器路径。
+             * FTP服务为FTP虚拟用户默认了根目录，所以我们可以切换也可以不切换，结果是一样的，都会到用户的根目录下。推荐显示指定。
+             * FTP服务会判断文件夹已存在，不会创建，不存在，则会创建。
+             */
+            ftpClient.changeWorkingDirectory(ftpBasePath);
+            if (StringUtils.isBlank(dirPath)) {
+                return false;
+            }
+
+            String[] dirPathArr = dirPath.split("/");
+            for (String dir : dirPathArr) {
+                if (StringUtils.isNotBlank(dir)) {
+                    ftpClient.makeDirectory(dir);
+                    // 切换到ftp的创建目录
+                    ftpClient.changeWorkingDirectory(dir);
+                }
+            }
+            return true;
+        } catch (IOException e) {
+            log.error("创建文件夹异常");
+            throw new FtpException("创建文件夹异常");
+        } finally {
+            closeConnect(ftpClient);
+        }
+    }
+
+    /**
+     * 查询指定路径下的所有文件的文件名
+     * @param dirPath     查询指定路径
+     * @return
+     */
+    public List<String> listFileName(String dirPath) {
+        if (StringUtils.isBlank(dirPath)) {
+            return null;
+        }
+        FTPClient ftpClient = getFTPClient();
+
+        // 获得指定目录下所有文件名
+        FTPFile[] ftpFiles = null;
+        try {
+            //ftpClient.enterLocalPassiveMode(); // 列出路径下的所有文件的文件名
+            ftpFiles = ftpClient.listFiles(dirPath);
+        } catch (IOException e) {
+            log.info("获取文件列表失败");
+            throw new FtpException("获取文件列表失败");
+        } finally {
+            closeConnect(ftpClient);
+        }
+        List<String> fileNameList = new LinkedList<>();
+        for (int i = 0; ftpFiles != null && i < ftpFiles.length; i++) {
+            FTPFile file = ftpFiles[i];
+            if (file.isFile()) {
+                fileNameList.add(file.getName());
+            }
+        }
+        return fileNameList;
+    }
+
+    /**
+     * 上传文件到ftp服务
+     * @param ftpBasePath FTP用户上传的根目录
+     * @param fileDirPath 上传的文件存储目录
+     * @param fileName    上传的文件名
+     * @param is          上传的文件输入流
+     */
+    public boolean uploadFileToFtp(String ftpBasePath, String fileDirPath, String fileName, InputStream is) {
+        FTPClient ftpClient = getFTPClient();
+        boolean result = false;
+        try {
+            // 创建文件存储目录
+            createDirectory(ftpBasePath, fileDirPath);
+            // 切换到ftp的文件目录，即文件上传目录
+            ftpClient.changeWorkingDirectory(fileDirPath);
+            ftpClient.setControlEncoding("UTF-8");
+            ftpClient.setBufferSize(1024 * 10);
+            // 设置文件类型为二进制方式传输文件
+            ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
+            ftpClient.enterLocalPassiveMode();
+            ftpClient.setDefaultTimeout(18000);
+            ftpClient.setConnectTimeout(6000);
+            ftpClient.setSoTimeout(6000);
+            result = ftpClient.storeFile(fileName, is);
+        } catch (IOException e) {
+            log.error("上传文件到ftp服务失败:{}", e.getMessage());
+            throw new FtpException("上传文件到ftp服务失败:{}", e.getMessage());
+        } finally {
+            closeConnect(ftpClient);
+        }
+        return result;
+    }
+
+    /**
+     * 从FTP中获取文件的输入流
+     * @param ftpFilePath ftp文件路径，根目录开始
+     * @return
+     */
+    public InputStream getInputStreamOfFtpFile(String ftpFilePath) {
+        FTPClient ftpClient = getFTPClient();
+
+        InputStream is = null;
+        try {
+            is = ftpClient.retrieveFileStream(ftpFilePath);
+        } catch (IOException e) {
+            log.error("获取文件输入流异常");
+            throw new FtpException("获取文件输入流异常");
+        } finally {
+            closeConnect(ftpClient);
+        }
+        return is;
+    }
+
+    /**
+     * 删除ftp文件
+     * @param ftpFilePath ftp文件路径，根目录开始
+     * @return
+     */
+    public boolean deleteFtpFile(String ftpFilePath) {
+        FTPClient ftpClient = getFTPClient();
+        boolean result = false;
+        try {
+            result = ftpClient.deleteFile(ftpFilePath);
+        } catch (IOException e) {
+            log.error("删除ftp文件失败:{}", e.getMessage());
+            throw new FtpException("删除ftp文件失败:{}", e.getMessage());
+        } finally {
+            closeConnect(ftpClient);
+        }
+        return result;
+    }
+
+}
+
@@ -141,7 +141,7 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
-      ports: 49101,49200
+      ports: 49101,49101
       port: 9100
       httpPort: 3333
       addPortVal: 0
@@ -155,7 +155,7 @@ tuohua:
       stopSendPort: 9102
       ws: ws://61.169.120.202:1909/schedule/{stream}.live.flv
       wss: wss://61.169.120.202:2930/schedule/{stream}.live.flv
-      downloadFLV: http://118.113.164.50:1909/schedule/{stream}.live.flv
+      downloadFLV: http://61.169.120.202:1909/schedule/{stream}.live.flv
       get:
         url: http://192.168.169.100:3333/video/{stream}.flv
       playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
@@ -165,9 +165,9 @@ ftp:
   host: 192.168.169.100
   httpPath: ftp://192.168.169.100
   filePathPrefix: http://192.168.169.100:10021/wvp-local
-  password: ftpadmin
+  password: ftp@123
   port: 21
-  username: ftp@123
+  username: ftpadmin
   retryTimes: 5
   retryWaitTimes: 3000
@@ -152,7 +152,7 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
-       ports: 9000,9500
+       ports: 9000,9000
        addPortVal: 30000
        pushURL: http://192.168.169.100:3333/new/server/{pushKey}/{port}/{httpPort}
        stopPushURL: http://192.168.169.100:3333/stop/channel/{pushKey}/{port}/{httpPort}
@@ -160,13 +160,15 @@ export default {
               items[i].channel = channel
               items[i].name = items[i].startTime + '-' + items[i].endTime;
             }
-            this.historyData = items
-            console.log(this.historyData)
+            this.historyData = items;
             this.loading = false
           } else if (res && res.data && res.data.data && res.data.data.msg) {
             this.$message.error(res.data.data.msg);
             this.loading = false
-          } else {
+          } else if (items === undefined) {
+            this.historyData = [];
+            this.loading = false
+          }else {
             this.loading = false
           }
         }).cache(res => {
@@ -26,7 +26,8 @@ export default {
   //计算属性 类似于data概念",
   computed: {},
   //监控data中的数据变化",
-  watch: {},
+  watch: {
+  },
   //方法集合",
   methods: {
     //点击事件