fix():添加FTP配置，添加历史视频回放在多人情况下的友好提示

王鑫
1 parent 5077713e
Showing 52 changed files with 2446 additions and 712 deletions
pom.xml
src/main/java/com/genersoft/iot/vmp/TCPClient.java
src/main/java/com/genersoft/iot/vmp/TCPServer.java
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
src/main/java/com/genersoft/iot/vmp/jtt1078/app/VideoServerApp.java
src/main/java/com/genersoft/iot/vmp/jtt1078/server/Jtt1078Handler.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/DataBuffer.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/DataBufferConfig.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/controller/FTPController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/controller/FlowController.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/domain/ApiResult.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/domain/ApiResultData.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/domain/SimFlow.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/domain/UploadFileReq.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/handler/HttpClientUtil.java
src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/mapper/FlowMapper.java
@@ -95,6 +95,19 @@
     </profiles>
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/commons-net/commons-net -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.9.0</version>
+        </dependency>
+
+        <!-- hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.22</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -176,13 +189,6 @@
 			<scope>system</scope>
 			<systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
 		</dependency>
-		<dependency>
-			<groupId>com.kingbase</groupId>
-			<artifactId>kingbase8</artifactId>
-			<version>8.6.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>
-		</dependency>
         <!--Mybatis分页插件 -->
         <dependency>
@@ -210,14 +216,6 @@
 			<version>3.6.1</version>
 		</dependency>
-
-		<!--在线文档 -->
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-			<version>1.6.10</version>
-		</dependency>
-
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-springdoc-ui</artifactId>
@@ -290,12 +288,6 @@
             <version>2.7</version>
         </dependency>
-        <dependency>
-            <groupId>com.xiaoleilu</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>3.1.0</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
         <!--		<dependency>-->
         <!--			<groupId>net.sf.kxml</groupId>-->
@@ -361,12 +353,6 @@
             <artifactId>guava</artifactId>
             <version>32.1.3-jre</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
@@ -7,7 +7,7 @@ import java.net.Socket;
 public class TCPClient {
     public static void main(String[] args) throws Exception{
         //创建socket，并指定连接的是本机的端口号为65000的服务器socket
-        Socket socket = new Socket("118.113.164.50",3333);
+        Socket socket = new Socket("61.169.120.202",40000);
         //获取输出流
         OutputStream os = socket.getOutputStream();
         //获取输入流
@@ -6,7 +6,7 @@ import java.net.Socket;
 public class TCPServer {
     public static void main(String[] args) throws Exception{
         //创建socket，并将socket绑定到65000端口
-        ServerSocket ss = new ServerSocket(30020);
+        ServerSocket ss = new ServerSocket(30000);
         //死循环，使得socket一直等待并处理客户端发送过来的请求
         while(true){
             //监听65000端口，直到客户端返回连接信息后才返回
@@ -60,7 +60,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     private JwtAuthenticationFilter jwtAuthenticationFilter;
-    public static final List<String> ALLOWED_IPS = Arrays.asList("192.169.1.88", "127.0.0.1");
+    public static final List<String> ALLOWED_IPS = Arrays.asList("192.169.1.97", "127.0.0.1");
     /**
 package com.genersoft.iot.vmp.jtt1078.app;
+import cn.hutool.core.collection.ConcurrentHashSet;
 import com.genersoft.iot.vmp.jtt1078.http.GeneralResponseWriter;
 import com.genersoft.iot.vmp.jtt1078.http.NettyHttpServerHandler;
 import com.genersoft.iot.vmp.jtt1078.publisher.PublishManager;
@@ -7,7 +8,6 @@ import com.genersoft.iot.vmp.jtt1078.server.Jtt1078Handler;
 import com.genersoft.iot.vmp.jtt1078.server.Jtt1078MessageDecoder;
 import com.genersoft.iot.vmp.jtt1078.server.SessionManager;
 import com.genersoft.iot.vmp.jtt1078.util.Configs;
-import com.xiaoleilu.hutool.collection.ConcurrentHashSet;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -17,7 +17,10 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import static com.genersoft.iot.vmp.VManageBootstrap.getBean;
@@ -25,13 +28,18 @@ import static com.genersoft.iot.vmp.VManageBootstrap.getBean;
 /**
  * Created by matrixy on 2019/4/9.
  */
-public class Jtt1078Handler extends SimpleChannelInboundHandler<Packet>
-{
+public class Jtt1078Handler extends SimpleChannelInboundHandler<Packet> {
     private static ApplicationContext applicationContext;
     static Logger logger = LoggerFactory.getLogger(Jtt1078Handler.class);
     private static final AttributeKey<Session> SESSION_KEY = AttributeKey.valueOf("session-key");
     private Integer port;
+    private String time;
+
+    private static final DataBuffer simFlowDataBuffer = getBean(DataBuffer.class);
+
+    private static final ConcurrentHashMap<String, SimFlow> sizeMap = new ConcurrentHashMap<>();
+
     public Jtt1078Handler(Integer port) {
         this.port = port;
     }
@@ -43,37 +51,51 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt;
      * 流来
      */
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, Packet packet) throws Exception
-    {
+    protected void channelRead0(ChannelHandlerContext ctx, Packet packet) throws Exception {
         io.netty.channel.Channel nettyChannel = ctx.channel();
         packet.seek(8);
         String sim = packet.nextBCD() + packet.nextBCD() + packet.nextBCD() + packet.nextBCD() + packet.nextBCD() + packet.nextBCD();
         int channel = packet.nextByte() & 0xff;
         String tag = sim + "-" + channel;
         tag = tag.replaceAll("^0+", "");
-        if (port != null){
+        if (port != null) {
             Set<String> set = Jt1078OfCarController.map.get(port);
             String findSet = Jt1078OfCarController.getFindSet(set, tag);
-            if (findSet != null){
+            if (findSet != null) {
                 tag = findSet + "_" + port;
-            }else {
+            } else {
                 return;
             }
         }
         StringRedisTemplate redisTemplate = getBean(StringRedisTemplate.class);
-        if (redisTemplate.opsForSet().add("tag:" + tag, tag) > 0){
+        if (redisTemplate.opsForSet().add("tag:" + tag, tag) > 0) {
             redisTemplate.expire("tag:" + tag, 60, TimeUnit.SECONDS);
-            logger.info("[ {} ] --> 流接收成功 ",tag);
-        }else {
+            logger.info("[ {} ] --> 流接收成功 ", tag);
+        } else {
             redisTemplate.expire("tag:" + tag, 60, TimeUnit.SECONDS);
         }
-        double num = new BigDecimal(packet.size()).divide(new BigDecimal(1024 * 1024 * 1024), 10, BigDecimal.ROUND_HALF_UP).doubleValue();
-        DataBuffer simFlowDataBuffer = getBean(DataBuffer.class);
-        if (simFlowDataBuffer != null) {
-            simFlowDataBuffer.setValue(SimFlow.build(sim,String.valueOf(channel),num));
+        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+
+        String key = sim + "-" + channel;
+        if (sizeMap.containsKey(key)){
+            SimFlow simFlow = sizeMap.get(key);
+            simFlow.setFlow(simFlow.getFlow() + packet.size());
+            simFlow.setCount(simFlow.getCount() + 1);
+        }else {
+            sizeMap.put(key, SimFlow.builder().sim(sim).count(1).flow((long) packet.size()).channel(channel).time(format).build());
         }
-        if (SessionManager.contains(nettyChannel, "tag") == false)
-        {
+        if (time == null || !time.equals(format)) {
+            time = format;
+            sizeMap.entrySet().forEach(entry -> {
+                SimFlow value = entry.getValue();
+                logger.debug("{} === {}次 === {} 流来的大小 {} ", value.getTime(), value.getCount(), value.getSim() + "-" + value.getChannel(), value.getFlow());
+                if (simFlowDataBuffer != null) {
+                    simFlowDataBuffer.setValue(value);
+                }
+            });
+            sizeMap.clear();
+        }
+        if (SessionManager.contains(nettyChannel, "tag") == false) {
             Channel chl = PublishManager.getInstance().open(tag);
             SessionManager.set(nettyChannel, "tag", tag);
             logger.info("start publishing: {} -> {}-{}", Long.toHexString(chl.hashCode() & 0xffffffffL), sim, channel);
@@ -92,19 +114,15 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt;
         int pt = packet.seek(5).nextByte() & 0x7f;
-        if (dataType == 0x00 || dataType == 0x01 || dataType == 0x02)
-        {
+        if (dataType == 0x00 || dataType == 0x01 || dataType == 0x02) {
             // 碰到结束标记时，序号+1
-            if (pkType == 0 || pkType == 2)
-            {
+            if (pkType == 0 || pkType == 2) {
                 sequence += 1;
                 SessionManager.set(nettyChannel, "video-sequence", sequence);
             }
             long timestamp = packet.seek(16).nextLong();
             PublishManager.getInstance().publishVideo(tag, sequence, timestamp, pt, packet.seek(lengthOffset + 2).nextBytes());
-        }
-        else if (dataType == 0x03)
-        {
+        } else if (dataType == 0x03) {
             long timestamp = packet.seek(16).nextLong();
             byte[] data = packet.seek(lengthOffset + 2).nextBytes();
             PublishManager.getInstance().publishAudio(tag, sequence, timestamp, pt, data);
@@ -112,15 +130,13 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt;
     }
     @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception
-    {
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         super.channelInactive(ctx);
         release(ctx.channel());
     }
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
-    {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         // super.exceptionCaught(ctx, cause);
         cause.printStackTrace();
         release(ctx.channel());
@@ -133,17 +149,15 @@ public class Jtt1078Handler extends SimpleChannelInboundHandler&lt;Packet&gt;
             IdleStateEvent event = (IdleStateEvent) evt;
             if (event.state() == IdleState.READER_IDLE) {
                 String tag = SessionManager.get(ctx.channel(), "tag");
-                logger.info("read timeout: {}",tag);
+                logger.info("read timeout: {}", tag);
                 release(ctx.channel());
             }
         }
     }
-    private void release(io.netty.channel.Channel channel)
-    {
+    private void release(io.netty.channel.Channel channel) {
         String tag = SessionManager.get(channel, "tag");
-        if (tag != null)
-        {
+        if (tag != null) {
             logger.info("close netty channel: {}", tag);
             PublishManager.getInstance().close(tag);
         }
@@ -12,6 +12,8 @@ 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.security.JwtUtils;
+import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
 import com.genersoft.iot.vmp.jtt1078.app.VideoServerApp;
 import com.genersoft.iot.vmp.jtt1078.publisher.PublishManager;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
@@ -26,7 +28,6 @@ import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.Jt1078ConfigBean;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.RtspConfigBean;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.TuohuaConfigBean;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.PatrolDataReq;
-import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.SimFlow;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.handler.HttpClientUtil;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.FlowService;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.Jt1078OfService;
@@ -43,10 +44,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.Cursor;
-import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.*;
 import sun.misc.Signal;
@@ -54,6 +52,7 @@ import sun.misc.SignalHandler;
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotBlank;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -109,7 +108,7 @@ public class Jt1078OfCarController {
     //存储历史端口 key -->端口  value ---> sim-channel-startTime-endTime-port
     public static final ConcurrentHashMap<Integer, Set<String>> map = new ConcurrentHashMap<>();
-    private static final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10,20,40,TimeUnit.SECONDS,new ArrayBlockingQueue<>(10));
+    private static final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 20, 40, TimeUnit.SECONDS, new ArrayBlockingQueue<>(10));
     @Value("${spring.profiles.active}")
     private String profilesActive;
@@ -118,11 +117,6 @@ public class Jt1078OfCarController {
     public Jt1078OfCarController() {
     }
-    @GetMapping("/flow/countList/{timeType}/{statisticsType}/{time}")
-    public Map<String, SimFlow> flowCountList(@PathVariable String statisticsType, @PathVariable String time, @PathVariable String timeType) {
-        return flowService.getList(timeType, statisticsType, time);
-    }
-
     @GetMapping({"/company/tree"})
     public Map<String, Object> requestTreeOfCompany() {
         Map<String, Object> resultMap = new HashMap();
@@ -154,6 +148,7 @@ public class Jt1078OfCarController {
         return resultMap;
     }
+
     /**
      * redis清除在线车辆
      */
@@ -163,8 +158,10 @@ public class Jt1078OfCarController {
             redisTemplate.delete(carId);
         }
     }
+
     /**
      * redis存储在线车辆
+     *
      * @param linesCars
      */
     public HashMap<String, Object> storageRedisTree(List<HashMap<String, Object>> linesCars) {
@@ -214,6 +211,7 @@ public class Jt1078OfCarController {
     /**
      * 请求设备推送流
+     *
      * @param sim     sim号
      * @param channel 通道号
      * @return
@@ -221,14 +219,14 @@ public class Jt1078OfCarController {
     @GetMapping({"/send/request/io/{sim}/{channel}"})
     public StreamContent sendIORequest(@PathVariable String sim, @PathVariable String channel) {
         if (StringUtils.isBlank(sim)) {
-            throw new ControllerException(-100,"sim 不能为空");
+            throw new ControllerException(-100, "sim 不能为空");
         }
         if (StringUtils.isBlank(channel)) {
             throw new ControllerException(-100, "channel 不能为空");
         }
         String stream = StringUtils.join(new String[]{sim, "-", channel});
         StreamContent streamContent = getStreamContentPlayURL(stream);
-        if (Objects.isNull(streamContent) || StringUtils.isBlank(streamContent.getWs_flv())){
+        if (Objects.isNull(streamContent) || StringUtils.isBlank(streamContent.getWs_flv())) {
             sendIORequest(stream);
         }
         streamContent = getStreamContent(stream);
@@ -239,6 +237,7 @@ public class Jt1078OfCarController {
     /**
      * 批量请求设备推送流
+     *
      * @param streamList 流唯一值集合 {sim-channel}
      */
     @PostMapping({"/beachSend/request/io"})
@@ -256,6 +255,7 @@ public class Jt1078OfCarController {
     /**
      * 视频巡查功能开启
+     *
      * @param PatrolDataReqList 视频巡查请求对象
      */
     @PostMapping({"/startPatrol/request/io"})
@@ -278,13 +278,14 @@ public class Jt1078OfCarController {
      * 关闭视频巡查 （必须在关闭按钮后关闭，否则流量在一直消耗）
      */
     @GetMapping("/stopPatrol/request/io")
-    public void stopPatrol(){
+    public void stopPatrol() {
         Set<Object> keys = redisTemplate.keys("patrol:stream:*");
         redisTemplate.delete(keys);
     }
     /**
      * 获取播放地址对外接口
+     *
      * @param sim
      * @param channel
      * @return
@@ -292,7 +293,7 @@ public class Jt1078OfCarController {
     @PostMapping("/send/request/getPlay")
     public Object sendGetPlay(@RequestParam String sim, @RequestParam String channel) {
         if (StringUtils.isBlank(sim)) {
-            throw new ControllerException(-100,"sim 不能为空");
+            throw new ControllerException(-100, "sim 不能为空");
         }
         if (StringUtils.isBlank(channel)) {
             throw new ControllerException(-100, "channel 不能为空");
@@ -302,21 +303,21 @@ public class Jt1078OfCarController {
         StreamPushItem streamPushItem = streamPushController.getStreamPushItem(sim, channel);
         StreamContent playUrl = null;
         if (null != streamPushItem) {
-             playUrl = streamPushController.getPlayUrl(streamPushItem.getApp(), stream, streamPushItem.getMediaServerId());
-            if (playUrl != null){
-                return StreamPlayPath.build(playUrl,stream);
+            playUrl = streamPushController.getPlayUrl(streamPushItem.getApp(), stream, streamPushItem.getMediaServerId());
+            if (playUrl != null) {
+                return StreamPlayPath.build(playUrl, stream);
             }
         }
         HashMap<String, Object> resultMap = new HashMap<>();
-       sendIORequest(stream);
+        sendIORequest(stream);
         try {
             Thread.sleep(4000);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
-        if (map.get("code").equals("1")){
+        if (map.get("code").equals("1")) {
-            while (true){
+            while (true) {
                 streamPushItem = streamPushController.getStreamPushItem(sim, channel);
                 if (null == streamPushItem) {
                     try {
@@ -327,7 +328,7 @@ public class Jt1078OfCarController {
                     continue;
                 }
                 playUrl = streamPushController.getPlayUrl(streamPushItem.getApp(), stream, streamPushItem.getMediaServerId());
-                if (playUrl == null){
+                if (playUrl == null) {
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException e) {
@@ -335,7 +336,7 @@ public class Jt1078OfCarController {
                     }
                     continue;
                 }
-                return StreamPlayPath.build(playUrl,stream);
+                return StreamPlayPath.build(playUrl, stream);
             }
         }
         throw new RuntimeException("获取视频失败");
@@ -344,7 +345,8 @@ public class Jt1078OfCarController {
     /**
      * 请求设备开始推流
-     * @param stream   流唯一标识
+     *
+     * @param stream 流唯一标识
      */
     public void sendIORequest(String stream) {
@@ -373,7 +375,7 @@ public class Jt1078OfCarController {
                 HttpClientPostEntity entity1 = httpClientUtil.doPost(url, msg, jsessionid);
                 chooseEntity(entity1, url, false);
                 log.info("发送[ {} ]推流指令成功 ===》 {}", stream, new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            }  catch (Exception e) {
+            } catch (Exception e) {
                 log.error("发送推流指令异常;[{}], [{}], [{}]", url, msg, e.getMessage());
                 throw new ControllerException(ErrorCode.ERROR420);
             }
@@ -667,11 +669,18 @@ public class Jt1078OfCarController {
                                                       @PathVariable @NotBlank(message = "channel 不能为空") String channel,
                                                       @PathVariable @NotBlank(message = "开始时间不能为空") String startTime,
                                                       @PathVariable @NotBlank(message = "结束时间不能为空") String endTime,
-                                                      String channelMapping) {
+                                                      String channelMapping, HttpServletRequest request) {
+        String header = request.getHeader("access-token");
+        JwtUser jwtUser = JwtUtils.verifyToken(header);
+        String key = StringUtils.join(new String[]{"history:", sim, "-", channel});
+        Set<Object> keys = redisTemplate.keys(key + ":*");
+        String userKey = StringUtils.join(new String[]{key, ":", jwtUser.getUserName()});
+        if (CollectionUtils.isNotEmpty(keys) && !keys.contains(userKey)) {
+            throw new ControllerException(400, "该通道被其他用户占用，请浏览其他通道");
+        }
         Map<String, Object> resultMap = new HashMap();
         startTime = this.formatTime(startTime);
         endTime = this.formatTime(endTime);
-        String key = StringUtils.join(new String[]{sim, "-", channel});
         channelMapping = StringUtils.join(new String[]{sim, "-", channel,"-",startTime,"-",endTime});
         Integer historyPort = createHistoryPort(channelMapping);
         channelMapping = StringUtils.join(new String[]{channelMapping,"_", String.valueOf(historyPort)});
@@ -703,7 +712,6 @@ public class Jt1078OfCarController {
                 this.redisTemplate.opsForValue().set("tag:history:httpPort:" + channelMapping, entity.getHttpPort(), 2L, TimeUnit.DAYS);
                 this.redisTemplate.opsForValue().set("tag:history:httpPort:time:" + channelMapping, (new Date()).getTime(), StreamProxyTask.TIME_OUT, TimeUnit.SECONDS);
                 msg = this.jt1078ConfigBean.formatMessageHistoryPlayRTSP(sim, channel, startTime, endTime, this.rtspConfigBean, entity.getPort());
-
                 HttpClientPostEntity entity1 = this.httpClientUtil.doPost(url, msg, (String) null);
                 chooseEntity(entity1, url, true);
                 resultMap.put("code", "1");
@@ -712,7 +720,7 @@ public class Jt1078OfCarController {
                 resultMap.put("data", streamContent);
                 return resultMap;
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             log.error("发送推流指令异常;[{}], [{}], [{}]", url, msg, e.getMessage());
             throw new ControllerException(-20, "发送推流指令异常");
         }
@@ -721,7 +729,7 @@ public class Jt1078OfCarController {
     /**
      * 从set<String>中找到对应唯一的sim-channel值
      */
-    public static String getFindSet(Set<String> set,String targetString) {
+    public static String getFindSet(Set<String> set, String targetString) {
         for (String str : set) {
             if (str.startsWith(targetString)) {
                 return str; // 找到匹配项后立即返回
@@ -729,6 +737,7 @@ public class Jt1078OfCarController {
         }
         return null;
     }
+
     /**
      * 从形如"sim-channel-start-end"的字符串中提取第二个'-'之前的值。
      */
@@ -749,6 +758,7 @@ public class Jt1078OfCarController {
             return null; // 如果少于两个'-'，则返回null
         }
     }
+
     /**
      * 遍历Map，寻找第一个不包含指定string的Set<String>，
      * 将该string添加到Set中并返回对应的key，如果没有找到则返回null。
@@ -757,7 +767,7 @@ public class Jt1078OfCarController {
         // 使用entrySet()方法直接获取键值对进行迭代，效率更高
         for (Map.Entry<Integer, Set<String>> entry : map.entrySet()) {
             Set<String> set = entry.getValue();
-            if (set.contains(targetString)){
+            if (set.contains(targetString)) {
                 return entry.getKey();
             }
             // 如果当前Set不包含目标字符串，则添加并返回key
@@ -766,8 +776,8 @@ public class Jt1078OfCarController {
             set.add(targetString);
             if (secondDashValue != null && findSet == null) {
                 return entry.getKey(); // 立即返回对应的key，不再继续查找
-            }else {
-                clearMap(String.valueOf(entry.getKey()),findSet);
+            } else {
+                clearMap(String.valueOf(entry.getKey()), findSet);
             }
         }
         return null; // 如果所有Set都包含目标字符串，则返回null
@@ -776,7 +786,7 @@ public class Jt1078OfCarController {
     /**
      * 清理map中的值
      */
-    public void clearMap(String key,String value) {
+    public void clearMap(String key, String value) {
         if (StringUtils.isNotBlank(key) && StringUtils.isNotBlank(value)) {
             Set<String> strings = map.get(Integer.valueOf(key));
             if (strings == null) {
@@ -790,48 +800,48 @@ public class Jt1078OfCarController {
                     throw new RuntimeException(e);
                 }
                 String[] split = value.split("-");
-                stopHistory(split[1],split[0]);
+                stopHistory(split[1], split[0]);
                 strings.remove(value);
             }
-        }else {
+        } else {
             log.error("清理端口缓存错误 !!!");
         }
     }
     /**
      * 创建历史端口
+     *
      * @param key 通道唯一值
      */
-    public Integer createHistoryPort(String key){
+    public Integer createHistoryPort(String key) {
         Integer port = addStringToFirstNonContainingSet(key);
         if (port == null) {
-            throw new RuntimeException(String.format("[ %s ]通道观看人数太多,请等待 !!!",key));
+            throw new RuntimeException(String.format("[ %s ]通道观看人数太多,请等待 !!!", key));
         }
         try {
-            if (redisTemplate.opsForValue().get("history:port:"+port) == null) {
+            if (redisTemplate.opsForValue().get("history:port:" + port) == null) {
                 startPost(port);
-                redisTemplate.opsForValue().set("history:port:"+port, port);
+                redisTemplate.opsForValue().set("history:port:" + port, port);
             }
             return port;
         } catch (Exception e) {
-            log.error("{}",e.getMessage(),e);
+            log.error("{}", e.getMessage(), e);
             throw new RuntimeException(String.format("[ %s ]端口启动异常", port));
         }
     }
     /**
      * 启动历史端口监听
+     *
      * @param port 端口
      */
     private void startPost(Integer port) throws Exception {
         VideoServerApp videoServerApp = new VideoServerApp();
         VideoServerApp.VideoServer videoServer = videoServerApp.getVideoServer(port);
-        Signal.handle(new Signal("TERM"), new SignalHandler()
-        {
+        Signal.handle(new Signal("TERM"), new SignalHandler() {
             @Override
-            public void handle(Signal signal)
-            {
+            public void handle(Signal signal) {
                 videoServer.shutdown();
             }
         });
@@ -840,7 +850,7 @@ public class Jt1078OfCarController {
     @Nullable
-    private StreamContent getStreamContent(String stream){
+    private StreamContent getStreamContent(String stream) {
         StreamContent streamContent = this.getStreamContentPlayURL(stream);
         if (Objects.isNull(streamContent) || StringUtils.isEmpty(streamContent.getWs_flv())) {
@@ -863,8 +873,6 @@ public class Jt1078OfCarController {
      * @return
      */
     private StreamContent requestStreamContent(int count, String stream, int httpPort) {
-
-
         StreamContent streamContent = this.getStreamContentPlayURL(stream);
         return streamContent;
     }
@@ -975,35 +983,6 @@ public class Jt1078OfCarController {
     }
     /**
-     * 获取所有匹配模式 jt1078:server:port:* 的键，并找到其中剩余时间最短的键。
-     */
-    public String findKeyWithShortestTTL(String keyMatch) {
-        String shortestTTLKey = null;
-        long shortestTTL = Long.MAX_VALUE;
-        // 使用 SCAN 命令遍历键空间
-        Cursor<byte[]> cursor = redisTemplate.execute(
-                (RedisCallback<Cursor<byte[]>>) connection -> {
-                    ScanOptions options = ScanOptions.scanOptions().match(keyMatch).count(100).build();
-                    return connection.scan(options);
-                });
-
-        if (cursor != null) {
-            while (cursor.hasNext()) {
-                byte[] keyBytes = cursor.next();
-                String key = new String(keyBytes);
-
-                // 获取当前键的 TTL
-                Long ttl = redisTemplate.getExpire(key, TimeUnit.SECONDS);
-                if (ttl != null && ttl >= 0 && ttl < shortestTTL) {
-                    shortestTTL = ttl;
-                    shortestTTLKey = key;
-                }
-            }
-        }
-        return shortestTTLKey;
-    }
-
-    /**
      * 创建监听者
      *
      * @param channelMapping
@@ -1040,13 +1019,13 @@ public class Jt1078OfCarController {
                 if (flag) {
                     if (StringUtils.isNoneBlank(new CharSequence[]{rsultMap.get("msg") + ""})) {
-                        throw  new ControllerException(304, String.valueOf(rsultMap.get("msg")));
+                        throw new ControllerException(304, String.valueOf(rsultMap.get("msg")));
                     }
                 }
             } catch (Exception var6) {
                 Exception e = var6;
-                log.error("entity.getResultStr():{{}}", entity.getResultStr(), e.getMessage(), e);
-                throw new ControllerException(500,e.getMessage());
+                log.error("entity.getResultStr():{{}}", entity.getResultStr(), e.getMessage());
+                throw new ControllerException(500, e.getMessage());
             }
         }
     }
@@ -29,8 +29,12 @@ public class DataBuffer&lt;T&gt; {
     public List<T> getDataList(){
         if (booleanValue.getAndSet(!booleanValue.get())){
-            return new ArrayList<>(trueQueue);
+            ArrayList<T> list = new ArrayList<>(trueQueue);
+            trueQueue.clear();
+            return list;
         }
-        return new ArrayList<>(falseQueue);
+        ArrayList<T> list = new ArrayList<>(falseQueue);
+        falseQueue.clear();
+        return list;
     }
 }
@@ -63,10 +63,10 @@ public class DataBufferConfig {
                         SimFlow simFlow = flowService.selectOne(value);
                         if (simFlow == null) {
                             boolean b = flowService.addFlow(value);
-                            log.info("流量信息添加 {} ",b?"成功":"失败");
+                            log.debug("流量信息添加 {} ",b?"成功":"失败");
                         }else {
                             boolean b = flowService.updateFlow(value);
-                            log.info("修改库中流量信息 {} ",b?"成功":"失败");
+                            log.debug("修改库中流量信息 {} ",b?"成功":"失败");
                         }
                     });
                 }
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Ftp配置
+ *
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "ftp")
+public class FtpConfigBean {
+
+    private String basePath;
+    /**
+     * ftp地址
+     */
+    private String host;
+    private String httpPath;
+    /**
+     *
+     */
+    private String filePathPrefix;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 端口
+     */
+    private Integer port;
+    /**
+     * 用户名
+     */
+    private String username;
+    /**
+     * 失败重试次数 -1为一直重试
+     */
+    private Integer retryTimes;
+    /**
+     * 失败重试间隔时间
+     */
+    private Integer retryWaitTimes;
+}
-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\":0,\"storageType\":0,\"channelId\":{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 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 cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.ben.HttpClientPostEntity;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.CarData;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.handler.HttpClientUtil;
-import com.xiaoleilu.hutool.convert.Convert;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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.security.MessageDigest;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 /**
  * @author liujun
  * @date 2024年10月23日 13:34
  */
+@Slf4j
 @Component
 public class TuohuaConfigBean {
@@ -50,6 +55,8 @@ public class TuohuaConfigBean {
     @Value("${spring.profiles.active}")
     private String profileActive;
+    public static final ConcurrentHashMap<String, CarData> map = new ConcurrentHashMap<>();
+
     @Autowired
     private RedisTemplate redisTemplate;
@@ -111,6 +118,19 @@ public class TuohuaConfigBean {
         return Objects.isNull(postEntity) ? null : postEntity.getResultStr();
     }
+    @Resource
+    private HttpClientUtil httpClientUtil;
+
+    @PostConstruct
+    public void init() {
+        try {
+            String carJson = requestCars(httpClientUtil, String.valueOf(100));
+            setMap(carJson);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public String requestCars(HttpClientUtil httpClientUtil, String companyId) throws Exception {
         String nonce = random(6);
         String timestamp = String.valueOf(new Date().getTime());
@@ -140,6 +160,30 @@ public class TuohuaConfigBean {
         return (List<HashMap>) JSON.parseArray(postEntity.getResultStr(), HashMap.class);
     }
+    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");
+                map.put(value.getSim(), value);
+            }else {
+                for (CarData carDatum : carData) {
+                    log.debug("{} ----》 {}",count++,JSON.toJSONString(carDatum));
+                    if (carDatum == null || carDatum.getSim() == null) {
+                        continue;
+                    }
+                    map.put(carDatum.getSim(), carDatum);
+                }
+            }
+        }
+    }
+
+    public static CarData getCarData(String sim){
+        return map.get(sim);
+    }
+
     public List<HashMap<String, Object>> requestOfLineAndCarAndCombationTree(HttpClientUtil httpClientUtil, String companyId) throws Exception {
         String lineJson = requestLine(httpClientUtil, companyId);
         String carJson = requestCars(httpClientUtil, companyId);
@@ -163,7 +207,10 @@ public class TuohuaConfigBean {
         List<HashMap> carJsonListFinal = carJsonList;
         List<HashMap<String, Object>> returnData = new ArrayList<>();
+
+
         if (linesSize > 0) {
+            setMap(carJson);
             List<HashMap<String, Object>> lines = linesJsonList.stream().map(hashMap -> {
                 String code = convertStr(hashMap.get("lineCode"));
                 String name = convertStr(hashMap.get("name"));
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.controller;
+
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.FTPService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * FTP控制层
+ *
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping("/ftp")
+public class FTPController {
+
+    @Resource
+    private FTPService ftpService;
+
+    /**
+     * 文件上传
+     * @param sim sim号
+     * @param channel 通道号
+     * @param startTime 起始时间
+     * @param endTime 终止时间
+     * @return 上传结果
+     */
+    @GetMapping("/uploadFile/{sim}/{channel}/{startTime}/{endTime}")
+    public String uploadFile(@PathVariable String sim,
+                             @PathVariable Integer channel,
+                             @PathVariable String startTime,
+                             @PathVariable String endTime) {
+        return ftpService.uploadFile(sim, channel, startTime, endTime);
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.controller;
+
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.SimFlow;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.FlowService;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 流量统计控制层
+ *
+ * @Author WangXin
+ * @Data 2025/2/10
+ * @Version 1.0.0
+ */
+@RestController
+@RequestMapping("/flow")
+public class FlowController {
+
+    @Resource
+    private FlowService flowService;
+
+    @GetMapping("/list/{timeType}/{statisticsType}/{time}/{sim}")
+    public List<SimFlow> list(@PathVariable String statisticsType,
+                              @PathVariable String time,
+                              @PathVariable String timeType,
+                              @PathVariable String sim) throws ServiceException {
+        return flowService.getList(timeType, statisticsType, time, sim);
+    }
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 大邑APi返回结果集
+ *
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApiResult {
+    /**
+     * 响应码(成功：200；客户端错误：400-499；服务端错误：500-599)
+     */
+    private Integer code;
+    /**
+     * 响应消息
+     */
+    private String msg;
+    /**
+     * 响应消息详情
+     */
+    private String detailMsg;
+    /**
+     * 响应消息体
+     */
+    private ApiResultData data;
+}
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 大邑Api响应消息体
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApiResultData {
+    /**
+     * 终端手机号
+     */
+    private String clientId;
+    /**
+     * 应答流水号
+     */
+    private Integer responseSerialNo;
+    /**
+     * 应答Id
+     */
+    private Integer responseMessageId;
+    /**
+     * 结果：0.成功 1.失败 2.消息有误 3.不支持 4.报警处理确认
+     */
+    private Integer resultCode;
+}
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
@@ -13,53 +17,19 @@ import java.util.Date;
  * @Data 2025/1/7
  * @Version 1.0.0
  */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
 public class SimFlow {
     private String id;
     private String sim;
-    private String channel;
-    private Double flow;
+    private Integer channel;
+    private Long flow;
+    private Integer count;
     private String time;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSim() {
-        return sim;
-    }
-
-    public void setSim(String sim) {
-        this.sim = sim;
-    }
-
-    public String getChannel() {
-        return channel;
-    }
-
-    public void setChannel(String channel) {
-        this.channel = channel;
-    }
-
-    public Double getFlow() {
-        return flow;
-    }
-
-    public void setFlow(Double flow) {
-        this.flow = flow;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
+    private CarData carData;
     @Override
     public String toString() {
@@ -72,13 +42,4 @@ public class SimFlow {
         sb.append('}');
         return sb.toString();
     }
-
-    public static SimFlow build(String sim, String channel, Double flow) {
-        SimFlow simFlow = new SimFlow();
-        simFlow.setSim(sim);
-        simFlow.setChannel(channel);
-        simFlow.setFlow(flow);
-        simFlow.setTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-        return simFlow;
-    }
 }
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 文件上传请求对象
+ *
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UploadFileReq {
+
+    /**
+     * 终端手机号
+     */
+    private String clientId;
+    /**
+     * FTP服务器地址
+     */
+    private String ip;
+    /**
+     * FTP服务器端口
+     */
+    private Integer port;
+    /**
+     * FTP服务器用户名
+     */
+    private String username;
+    /**
+     * FTP服务器密码
+     */
+    private String password;
+    /**
+     * 文件上传路径
+     */
+    private String path;
+    /**
+     * 逻辑通道号
+     */
+    private Integer channelNo;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+    /**
+     * 报警标志0~31(参考808协议文档报警标志位定义)
+     */
+    private Integer warnBit1 = 0;
+    /**
+     * 报警标志32~63
+     */
+    private Integer warnBit2 = 0;
+    /**
+     * 音视频资源类型：0.音视频 1.音频 2.视频 3.视频或音视频
+     */
+    private Integer mediaType = 0;
+    /**
+     * 码流类型：0.所有码流 1.主码流 2.子码流
+     */
+    private Integer streamType = 1;
+    /**
+     * 存储位置：0.所有存储器 1.主存储器 2.灾备存储器
+     */
+    private Integer storageType = 0;
+    /**
+     * 任务执行条件(用bit位表示)：[0]WIFI下可下载 [1]LAN连接时可下载 [2]3G/4G连接时可下载
+     */
+    private Integer condition = 0;
+}
@@ -38,6 +38,7 @@ public class HttpClientUtil {
     private static final Logger log = LoggerFactory.getLogger(HttpClientUtil.class);
     public HttpClientPostEntity doPost(String url, Map<String, String> params,  String jsessionid) throws URISyntaxException, IOException {
+        long startTime = System.currentTimeMillis();
         // 创建Httpclient对象
         DefaultHttpClient httpclient = getHttpClient();
         // 定义请求的参数
@@ -64,7 +65,7 @@ public class HttpClientUtil {
             response = httpclient.execute(httpPost);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                return combationReturnObj(response, httpclient,url, null);
+                return combationReturnObj(response, httpclient,url, null,startTime);
             }
         } finally {
             if (response != null) {
@@ -76,6 +77,7 @@ public class HttpClientUtil {
     }
     public HttpClientPostEntity doPost(String url, String requestBody,  String jsessionid) throws URISyntaxException, IOException {
+        long startTime = System.currentTimeMillis();
         // 创建Httpclient对象
         DefaultHttpClient httpclient = getHttpClient();
         // 定义请求的参数
@@ -99,7 +101,7 @@ public class HttpClientUtil {
             response = httpclient.execute(httpPost);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                return combationReturnObj(response, httpclient,url,requestBody);
+                return combationReturnObj(response, httpclient,url,requestBody,startTime);
             }
         } catch (Exception e) {
             log.error("请求数据异常", e);
@@ -130,6 +132,7 @@ public class HttpClientUtil {
     }
     public HttpClientPostEntity doGet(String url, String jsessionid) throws URISyntaxException, IOException {
+        long startTime = System.currentTimeMillis();
         // 创建Httpclient对象
         DefaultHttpClient httpclient = getHttpClient();
         // 定义请求的参数
@@ -151,7 +154,7 @@ public class HttpClientUtil {
             response = httpclient.execute(httpGet);
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
-                return combationReturnObj(response, httpclient,url,null);
+                return combationReturnObj(response, httpclient,url,null,startTime);
             }
         } finally {
             if (response != null) {
@@ -204,7 +207,7 @@ public class HttpClientUtil {
      * @throws IOException
      */
     @NotNull
-    private static HttpClientPostEntity combationReturnObj(CloseableHttpResponse response, DefaultHttpClient httpclient,String url,String requestBody) throws IOException {
+    private static HttpClientPostEntity combationReturnObj(CloseableHttpResponse response, DefaultHttpClient httpclient,String url,String requestBody,long startTime) throws IOException {
         HttpEntity httpEntity = response.getEntity();
         CookieStore cookieStore = httpclient.getCookieStore();
@@ -213,7 +216,7 @@ public class HttpClientUtil {
         HttpClientPostEntity postEntity = new HttpClientPostEntity();
         postEntity.setCookieStore(cookieStore);
         postEntity.setResultStr(result);
-        log.info("url:{};requestBody:{};response :{}",url,requestBody,"请求成功");
+        log.info("url:{};requestBody:{};response :{}; 耗时: {}s ",url,requestBody,"请求成功",System.currentTimeMillis()-startTime);
         return postEntity;
     }
@@ -16,30 +16,39 @@ public interface FlowMapper {
     @Select(value = {" <script>" +
             "SELECT " +
-            "        <if test=\"time != null and time == 'day'\" >" +
+            "        <if test=\"timeType != null and timeType == 'day'\" >" +
             "            `time`," +
             "        </if>" +
-            "        <if test=\"time != null and time == 'year'\" >" +
+            "        <if test=\"timeType != null and timeType == 'year'\" >" +
             "          YEAR(`time`) `time`," +
             "        </if>" +
-            "        <if test=\"time != null and time == 'month'\" >" +
+            "        <if test=\"timeType != null and timeType == 'month'\" >" +
             "              CONCAT(YEAR(`time`),'-',MONTH(`time`)) `time`," +
             "        </if>" +
-            "          `sim`, `channel`, SUM(flow) flow" +
+            "          `sim`, `channel`, SUM(flow) flow " +
+            "        <if test=\"statisticsType!=null and statisticsType !='' and statisticsType == 'All'\"> " +
+            "           ,COUNT(DISTINCT sim) count " +
+            "        </if>" +
             "        FROM `wvp_sim_flow`" +
             "        <where> " +
-            "           <if test=\"time != null and time != '' and statisticsType = 'day'\">" +
+            "           <if test=\"time != null and time != 'null' and time != 'undefined' and time != '' and timeType == 'day'\">" +
             "              AND time = #{time}" +
             "           </if>" +
-            "           <if test=\"time != null and time != '' and statisticsType = 'month'\">" +
+            "           <if test=\"time != null and time != 'null' and time != 'undefined' and time != '' and timeType == 'month'\">" +
             "              AND CONCAT(YEAR(`time`),'-',MONTH(`time`)) = #{time}" +
             "           </if>" +
-            "           <if test=\"time != null and time != '' and statisticsType = 'year'\">" +
+            "           <if test=\"time != null and time != 'null' and time != 'undefined' and time != '' and timeType == 'year'\">" +
             "              AND YEAR(`time`) = #{time}" +
             "           </if>" +
+            "           <if test=\"sim != null and sim != '' and sim != 'null' and sim != 'undefined'\"> " +
+            "              AND sim like CONCAT('%',#{sim})" +
+            "           </if>" +
             "       </where>" +
-        "             GROUP BY  sim " +
-        "            <if test=\"statisticsType!=null and statisticsType !='' and statisticsType = 'channel' \">" +
+            "   <trim prefix=\"GROUP BY\" prefixOverrides=\",\">" +
+            "        <if test=\"statisticsType!=null and statisticsType !='' and statisticsType != 'All'\"> " +
+            "           ,sim " +
+            "        </if>" +
+        "            <if test=\"statisticsType!=null and statisticsType !='' and statisticsType == 'channel' \">" +
         "               ,`channel` " +
         "            </if>" +
         "            <if test=\"timeType == 'day'\">" +
@@ -51,10 +60,11 @@ public interface FlowMapper {
         "            <if test=\"timeType == 'month'\" >" +
         "                ,CONCAT(YEAR(`time`),'-',MONTH(`time`))" +
         "            </if>" +
+            "</trim>" +
             "        ORDER BY `time` DESC " +
             "        </script>"}
     )
-    List<SimFlow> getList(@Param("timeType") String timeType, @Param("statisticsType") String statisticsType, @Param("time") String time);
+    List<SimFlow> getList(@Param("timeType") String timeType, @Param("statisticsType") String statisticsType, @Param("time") String time, @Param("sim") String sim);
     @Insert(
     "INSERT INTO " +
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.remote;
 import com.dtflys.forest.annotation.Address;
+import com.dtflys.forest.annotation.JSONBody;
+import com.dtflys.forest.annotation.Post;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.ApiResult;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.UploadFileReq;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.remote.cnofig.DaYiAddressSourceConfig;
 /**
@@ -11,4 +15,13 @@ import com.genersoft.iot.vmp.vmanager.jt1078.platform.remote.cnofig.DaYiAddressS
 */
 @Address(source = DaYiAddressSourceConfig.class)
 public interface DaYiApi {
+
+    /**
+     * 文件上传指令
+     * @param uploadFileReq 上传文件请求对象
+     * @return 结果集
+     */
+    @Post("/9206")
+    ApiResult uploadFile(@JSONBody UploadFileReq uploadFileReq);
+
 }
@@ -17,10 +17,8 @@ import static com.genersoft.iot.vmp.vmanager.util.URLParser.parseURL;
 @Configuration
 public class DaYiAddressSourceConfig implements AddressSource {
-    @Value("${tuohua.bsth.login.rest.baseURL}")
+    @Value("${tuohua.bsth.jt1078.new_url}")
     public  String baseURL;
-    @Value("${tuohua.bsth.login.rest.password}")
-    private String restPassword;
     @Override
     public ForestAddress getAddress(ForestRequest request) {
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.service;
+
+/**
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+public interface FTPService {
+    /**
+     * 文件上传
+     * @param sim sim号
+     * @param channel 通道号
+     * @param startTime 起始时间
+     * @param endTime 终止时间
+     * @return 上传结果
+     */
+    String uploadFile(String sim, Integer channel, String startTime, String endTime);
+}
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.service;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.SimFlow;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
 /**
  * @Author WangXin
@@ -13,10 +14,12 @@ import java.util.Map;
 public interface FlowService {
     /**
      * 流量列表
-     * @param timeType 时间类型
+     *
+     * @param timeType       时间类型
      * @param statisticsType 统计类型
+     * @param sim
      */
-    Map<String, SimFlow> getList(String timeType, String statisticsType, String time);
+    List<SimFlow> getList(String timeType, String statisticsType, String time, String sim) throws ServiceException;
     /**
      * 批量添加流量记录
+package com.genersoft.iot.vmp.vmanager.jt1078.platform.service.impl;
+
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.config.FtpConfigBean;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.ApiResult;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.UploadFileReq;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.remote.DaYiApi;
+import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.FTPService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author WangXin
+ * @Data 2025/2/11
+ * @Version 1.0.0
+ */
+@Service
+public class FTPServiceImpl implements FTPService {
+
+    @Resource
+    private DaYiApi daYiApi;
+    @Resource
+    private FtpConfigBean ftpConfigBean;
+
+
+    @Override
+    public String uploadFile(String sim, Integer channel, String startTime, String endTime) {
+
+        ApiResult apiResult = daYiApi.uploadFile(
+                UploadFileReq.builder()
+                        .ip(ftpConfigBean.getHost())
+                        .port(ftpConfigBean.getPort())
+                        .password(ftpConfigBean.getPassword())
+                        .username(ftpConfigBean.getUsername())
+                        .clientId(sim)
+                        .startTime(startTime)
+                        .endTime(endTime)
+                        .channelNo(channel)
+                        .build());
+        return apiResult.getMsg();
+    }
+}
 package com.genersoft.iot.vmp.vmanager.jt1078.platform.service.impl;
+import com.genersoft.iot.vmp.conf.exception.ServiceException;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.domain.SimFlow;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.mapper.FlowMapper;
 import com.genersoft.iot.vmp.vmanager.jt1078.platform.service.FlowService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
+import static com.genersoft.iot.vmp.vmanager.jt1078.platform.config.TuohuaConfigBean.getCarData;
+
 /**
  * @Author WangXin
  * @Data 2025/1/7
@@ -21,11 +25,12 @@ public class FlowServiceImpl implements FlowService {
     private FlowMapper flowMapper;
     @Override
-    public  Map<String, SimFlow> getList(String timeType, String statisticsType, String time) {
-        List<SimFlow> list = flowMapper.getList(timeType, statisticsType, time);
-
-
-        return null;
+    public  List<SimFlow> getList(String timeType, String statisticsType, String time, String sim) throws ServiceException {
+        if (timeType != null && "day".equals(timeType) && time != null && !"null".equals(time)) {
+            time = time.split(" ")[0];
+        }
+        return flowMapper.getList(timeType, statisticsType, time, sim)
+                .stream().peek(simFlow -> simFlow.setCarData(getCarData(simFlow.getSim()))).collect(Collectors.toList());
     }
     @Override
 package com.genersoft.iot.vmp.vmanager.streamProxy;
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.GeneralCallback;
 import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
@@ -30,13 +30,11 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
+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.http.HttpUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.security.MessageDigest;
+import java.util.*;
+
+/**
+ * RS 接口调用工具类
+ * Created by panzhao on 2017/8/2.
+ */
+public class RsRequestUtils {
+
+    private static String password;
+
+    static {
+        password = "f8267b7bc5e51994bab57c8e8884f203609d1dc3";
+    }
+
+    static Logger logger = LoggerFactory.getLogger(RsRequestUtils.class);
+
+    /**
+     * 生成参数字符串
+     *
+     * @return
+     */
+    public static String getParams() {
+        String rs = "";
+        try {
+            String nonce = getNonce(6);
+            long t = System.currentTimeMillis();
+
+            Map<String, String> map = new HashMap<>();
+            map.put("password", password);
+            map.put("timestamp", t + "");
+            map.put("nonce", nonce);
+
+            String sign = getSHA1(map);
+
+            rs = "?password=" + password + "&timestamp=" + t + "&nonce=" + nonce + "&sign=" + sign;
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    /**
+     * 生成参数字符串
+     *
+     * @return
+     */
+    public static String getParams(Map<String, String> paramMap) {
+        StringBuilder rs = new StringBuilder("?");
+        try {
+            String nonce = getNonce(6);
+            long t = System.currentTimeMillis();
+
+            paramMap.put("password", password);
+            paramMap.put("timestamp", t + "");
+            paramMap.put("nonce", nonce);
+
+            String sign = getSHA1(paramMap);
+            paramMap.put("sign", sign);
+
+            Set<String> ks = paramMap.keySet();
+            for (String k : ks) {
+                rs.append(k + "=" + paramMap.get(k) + "&");
+            }
+            rs.deleteCharAt(rs.length() - 1);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return rs.toString();
+    }
+
+    /**
+     * 生成随机字符串
+     *
+     * @return
+     */
+    public static String getNonce(int length) {
+        String base = "abcdefghijklmnopqrstuvwxyz0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < length; i++) {
+            int number = random.nextInt(base.length());
+            sb.append(base.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    private static String getSHA1(Map<String, String> map) throws Exception {
+        try {
+            String[] array = new String[map.size()];
+            map.values().toArray(array);
+            StringBuffer sb = new StringBuffer();
+            // 字符串排序
+            Arrays.sort(array);
+            for (int i = 0; i < array.length; i++) {
+                sb.append(array[i]);
+            }
+            String str = sb.toString();
+            // SHA1签名生成
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            md.update(str.getBytes());
+            byte[] digest = md.digest();
+            StringBuffer hexStr = new StringBuffer();
+            String shaHex;
+            for (int i = 0; i < digest.length; i++) {
+                shaHex = Integer.toHexString(digest[i] & 0xFF);
+                if (shaHex.length() < 2) {
+                    hexStr.append(0);
+                }
+                hexStr.append(shaHex);
+            }
+            return hexStr.toString();
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
+    public static void main(String[] args) {
+//        StringBuilder rs = null;
+//        try {
+//            rs = HttpClientUtils.get("http://106.14.30.180:9089/webservice/rest/schedule_real/execs?password=e126853c7f6f43b4857fa8dfe3b28b5d90be9e68&timestamp=1587101390953&nonce=z5uefd&sign=cbdc60ec931cdf8f4b45104ddd6809a16f82e76f");
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+        String lineInfoUrl = "http://58.34.47.74:9089/webservice/rest/line/company/55" + RsRequestUtils.getParams();
+        String lineInfoJson = HttpUtil.get(lineInfoUrl);
+        System.out.println(lineInfoUrl);
+//        System.out.println(rs.toString());
+//        List<ScheduleRealInfo> list = JSONArray.parseArray(rs.toString(), ScheduleRealInfo.class);
+//        System.out.println(list.size());
+
+    }
+}
@@ -182,7 +182,6 @@ public class ApiStreamController {
                 result.setResult(resultJjson);
             }
         });
-
         return result;
     }
@@ -31,7 +31,7 @@ spring:
         master:
           type: com.zaxxer.hikari.HikariDataSource
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.169.100:3306/wvp4?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=TRUE&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.169.100:3306/wvp4?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=TRUE&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&sessionVariables=sql_mode='NO_ENGINE_SUBSTITUTION'&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
           username: root
           password: guzijian
           hikari:
@@ -141,13 +141,14 @@ tuohua:
         historyUdpPort: 9999
         ip : 61.169.120.202
     jt1078:
-      ports: 9101,9600
+      ports: 49101,49200
       port: 9100
       httpPort: 3333
       addPortVal: 0
       pushURL: http://127.0.0.1:3333/new/server/{pushKey}/{port}/{httpPort}
       stopPushURL: http://127.0.0.1:3333/stop/channel/{pushKey}/{port}/{httpPort}
       url: http://192.168.168.152:8100/device/{0}
+      new_url: http://192.168.168.152:8100/device
       historyListPort: 9205
       playHistoryPort: 9201
       sendPort: 9101
@@ -159,3 +160,31 @@ tuohua:
         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}
+ftp:
+  basePath: /wvp-local
+  host: 192.168.169.100
+  httpPath: ftp://192.168.169.100
+  filePathPrefix: http://192.168.169.100:10021/wvp-local
+  password: ftpadmin
+  port: 21
+  username: ftp@123
+  retryTimes: 5
+  retryWaitTimes: 3000
+
+forest:
+  backend: okhttp3             # 后端HTTP框架（默认为 okhttp3）
+  max-connections: 1000        # 连接池最大连接数（默认为 500）
+  max-route-connections: 500   # 每个路由的最大连接数（默认为 500）
+  max-request-queue-size: 100  # [自v1.5.22版本起可用] 最大请求等待队列大小
+  max-async-thread-size: 300   # [自v1.5.21版本起可用] 最大异步线程数
+  max-async-queue-size: 16     # [自v1.5.22版本起可用] 最大异步线程池队列大小
+  timeout: 3000                # [已不推荐使用] 请求超时时间，单位为毫秒（默认为 3000）
+  connect-timeout: 3000        # 连接超时时间，单位为毫秒（默认为 timeout）
+  read-timeout: 3000           # 数据读取超时时间，单位为毫秒（默认为 timeout）
+  max-retry-count: 0           # 请求失败后重试次数（默认为 0 次不重试）
+  #  ssl-protocol: TLS            # 单向验证的HTTPS的默认TLS协议（默认为 TLS）
+  log-enabled: true            # 打开或关闭日志（默认为 true）
+  log-request: true            # 打开/关闭Forest请求日志（默认为 true）
+  log-response-status: true    # 打开/关闭Forest响应状态日志（默认为 true）
+  log-response-content: true   # 打开/关闭Forest响应内容日志（默认为 false）
+#  async-mode: platform         # [自v1.5.27版本起可用] 异步模式（默认为 platform）
-package com.genersoft.iot.vmp.jt1078;
-
-import com.genersoft.iot.vmp.jt1078.cmd.JT1078Template;
-import com.genersoft.iot.vmp.jt1078.codec.netty.TcpServer;
-import com.genersoft.iot.vmp.jt1078.proc.response.J9102;
-import com.genersoft.iot.vmp.jt1078.proc.response.J9201;
-import com.genersoft.iot.vmp.jt1078.proc.response.J9202;
-import com.genersoft.iot.vmp.jt1078.proc.response.J9205;
-
-import java.util.Scanner;
-
-/**
- * @author QingtaiJiang
- * @date 2023/4/28 14:22
- * @email qingtaij@163.com
- */
-public class JT1078ServerTest {
-
-    private static final JT1078Template jt1078Template = new JT1078Template();
-
-    public static void main(String[] args) {
-        System.out.println("Starting jt1078 server...");
-        TcpServer tcpServer = new TcpServer(21078);
-        tcpServer.start();
-        System.out.println("Start jt1078 server success!");
-
-
-        Scanner s = new Scanner(System.in);
-        while (true) {
-            String code = s.nextLine();
-            switch (code) {
-                case "1":
-                    test9102();
-                    break;
-                case "2":
-                    test9201();
-                    break;
-                case "3":
-                    test9202();
-                    break;
-                case "4":
-                    test9205();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private static void test9102() {
-        J9102 j9102 = new J9102();
-        j9102.setChannel(1);
-        j9102.setCommand(0);
-        j9102.setCloseType(0);
-        j9102.setStreamType(0);
-
-        String s = jt1078Template.stopLive("18864197066", j9102, 6);
-        System.out.println(s);
-    }
-
-    private static void test9201() {
-        J9201 j9201 = new J9201();
-        j9201.setIp("192.168.1.1");
-        j9201.setChannel(1);
-        j9201.setTcpPort(7618);
-        j9201.setUdpPort(7618);
-        j9201.setType(0);
-        j9201.setRate(0);
-        j9201.setStorageType(0);
-        j9201.setPlaybackType(0);
-        j9201.setPlaybackSpeed(0);
-        j9201.setStartTime("230428134100");
-        j9201.setEndTime("230428134200");
-
-        String s = jt1078Template.startBackLive("18864197066", j9201, 6);
-        System.out.println(s);
-    }
-
-    private static void test9202() {
-        J9202 j9202 = new J9202();
-
-        j9202.setChannel(1);
-        j9202.setPlaybackType(2);
-        j9202.setPlaybackSpeed(0);
-        j9202.setPlaybackTime("230428134100");
-
-        String s = jt1078Template.controlBackLive("18864197066", j9202, 6);
-        System.out.println(s);
-    }
-
-    private static void test9205() {
-        J9205 j9205 = new J9205();
-        j9205.setChannelId(1);
-        j9205.setStartTime("230428134100");
-        j9205.setEndTime("230428134100");
-        j9205.setMediaType(0);
-        j9205.setStreamType(0);
-        j9205.setStorageType(0);
-
-        String s = jt1078Template.queryBackTime("18864197066", j9205, 6);
-        System.out.println(s);
-    }
-}
@@ -11,14 +11,14 @@ module.exports = {
     assetsPublicPath: "/",
     proxyTable: {
       "/debug": {
-        target: "http://127.0.0.1:28080",
+        target: "http://127.0.0.1:16030",
         changeOrigin: true,
         pathRewrite: {
           "^/debug": "/",
         },
       },
       "/static/snap": {
-        target: "http://127.0.0.1:28080",
+        target: "http://127.0.0.1:16030",
         changeOrigin: true,
         // pathRewrite: {
         //   '^/static/snap': '/static/snap'
 <template>
-  <div id="devicePosition" style="width:100vw; height: 91vh">
+  <div v-loading="loading" id="devicePosition" style="width:100vw; height: 91vh">
     <el-container v-loading="loading" style="height: 91vh;" element-loading-text="拼命加载中">
       <el-aside width="300px" style="background-color: #ffffff">
-        <div class="device-tree-main-box">
-          <div id="DeviceTree" style="width: 100%;height: 100%; background-color: #FFFFFF; overflow: auto">
-            <el-container>
-              <el-header>设备列表</el-header>
-              <el-main style="background-color: #ffffff;">
-                <tree :nodes="nodes" @onClick="onClick" @onCheck="onCheck" @onExpand="onExpand"
-                      @onRightClick="treeRightMenuFun" @onCreated="handleCreated" :props="defaultProps"/>
-              </el-main>
-            </el-container>
-          </div>
-        </div>
+        <device1078-tree :tree-data="sourceValue" @node-click="nodeClick"></device1078-tree>
       </el-aside>
       <el-container>
         <el-header height="5vh" style="text-align: left;font-size: 17px;line-height:5vh;width:90%">
-
           <i class="el-icon-s-platform btn" :class="{active:spilt==1}" @click="spiltClickFun(1)"/>
           <i class="el-icon-menu btn" :class="{active:spilt==4}" @click="spiltClickFun(4)"/>
           <i class="el-icon-s-grid btn" :class="{active:spilt==9}" @click="spiltClickFun(9)"/>
           <i class="el-icon-full-screen btn" :class="{active:spilt==12}" @click="spiltClickFun(12)"/>
-
           <el-button size="mini" style="margin-left: 15px;" @click="oneClickPlayback()">一键播放车辆视频</el-button>
           <el-button size="mini" style="margin-left: 15px;" @click="closeSelectItem()">关闭选中画面流</el-button>
           <el-button size="mini" style="margin-left: 15px;" @click="closeSelectCarItem()">一键关闭选中车辆流</el-button>
-          <el-button size="mini" style="margin-left: 15px;" @click="inspectionsDialog">视屏巡查</el-button>
+          <el-button size="mini" style="margin-left: 15px;" @click="inspectionsDialog" v-if="patrolValue" type="danger">
+            视屏巡查中
+          </el-button>
+          <el-button size="mini" style="margin-left: 15px;" @click="inspectionsDialog" v-else>视屏巡查</el-button>
         </el-header>
-
         <el-main style="padding: 0;">
-          <div class="scroll-container" style="width: 100%;height: 85vh;display: flex;flex-wrap: wrap;background-color: #000;">
+          <div class="scroll-container"
+               style="width: 100%;height: 85vh;display: flex;flex-wrap: wrap;background-color: #000;">
             <div v-for="i in spilt" :key="i" class="play-box"
                  :style="liveStyle" :class="{redborder:playerIdx == (i-1)}"
                  @click="playerIdx = (i-1)">
@@ -58,18 +49,55 @@
     <el-dialog title="视屏巡查设置" width="600" append-to-body
                :close-on-click-modal="false"
-               :visible.sync="showVideoDialog" >
-          <tree-transfer
-            style="text-align: left; display: inline-block"
-            :to_data="targetValue"
-            :filter="true"
-            :title="['源列表', '巡查列表']"
-            @change="handleChange"
-            :from_data="sourceValue">
-          </tree-transfer>
+               :visible.sync="showVideoDialog" v-loading="loading">
+      <el-card class="box-card">
+        <tree-transfer
+          :disabled="patrolValue"
+          style="text-align: left; display: inline-block;"
+          :to_data="targetValue"
+          :defaultExpandedKeys="expandedKeys"
+          node_key="id"
+          :filter="true"
+          :title="['源列表', '巡查列表']"
+          :from_data="sourceValue"
+          :defaultProps="treeProps"
+          :filter-node="filterNode"
+          class="inspections-tree"
+          height="500px">
+        </tree-transfer>
+      </el-card>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span style="font-size: math">巡查时间间隔</span>
+        </div>
+        <el-time-select
+          v-model="timerTime"
+          :picker-options="{
+            start: '00:30',
+            step: '00:30',
+            end: '5:00'
+          }"
+          placeholder="选择巡查时间"
+          :disabled="patrolValue">
+        </el-time-select>
+      </el-card>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span style="font-size: math">巡查宫格数量</span>
+        </div>
+        <el-select v-model="patrolCell" placeholder="placeholder" :disabled="patrolValue">
+          <el-option
+            v-for="item in patrolCellList"
+            :key="item"
+            :label="item"
+            :value="item">
+          </el-option>
+        </el-select>
+      </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="danger" v-if="patrolValue" @click="closeInspections">关闭</el-button>
+        <el-button type="primary" v-else @click="openInspections">开启</el-button>
+        <el-button @click="showVideoDialog = false">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -80,34 +108,60 @@ import uiHeader from &quot;../layout/UiHeader.vue&quot;;
 import player from './common/jessibuca.vue';
 import DeviceTree from './common/DeviceTree.vue'
 import treeTransfer from "el-tree-transfer";
+import {parseTime} from "../../utils/ruoyi";
+import Device1078Tree from "./JT1078Components/deviceList/Device1078Tree.vue";
+
 export default {
   name: "live",
   components: {
+    Device1078Tree,
     uiHeader, player, DeviceTree, tree, treeTransfer
   },
   data() {
     return {
-      //穿梭框数据-----------↓
+      //车辆列表过滤
+      filterText: '',
+      //穿梭框巡查数据-----------↓
+      //穿梭框默认展开
+      expandedKeys: [],
+      // 批次获取器
+      batchFetcher: null,
       //源列表数据
       sourceValue: [],
+      //原始sim列表 （sim对象）
+      simList: [],
       //目标列表数据
       targetValue: [],
+      //巡查播放原始列表
+      lastTargetValue: [],
+      //巡查过滤列表 （sim）
+      lastTargetValueFilter: [],
+      //现在正在播放的列表
+      nowPlayArray: [],
       //prop参数
-      treeProps:{
+      treeProps: {
         children: 'children',
-        label: 'label',
-        name: 'name'
+        label: 'name',
+        disabled: 'disabled',
       },
       //巡查按钮
       patrolValue: false,
-      //巡查数据定时器
-      carInfoTimeout: '',
+      //巡查宫格数量
+      patrolCell: 9,
+      //巡查宫格下拉框数据
+      patrolCellList: [1, 4, 9, 12],
+      //巡查时间
+      timerTime: '00:30',
       //巡查定时器
-      timer : '',
+      fetchInterval: null,
       //上线车辆
       onlineCar: new Map(),
+      //车辆数据定时器
+      carInfoTimeout: null,
       //车载key集合
       onlineCarKeys: [],
+      //树节点对象
+      simNodeData: null,
       videoUrl: [''],
       videoUrlHistory: "",
       spilt: 1,//分屏
@@ -167,6 +221,7 @@ export default {
   },
   created() {
     this.checkPlayByParam();
+    this.getCarInfoBuffer()
   },
   beforeDestroy() {
     if (!this.isEmpty(this.timer)) {
@@ -224,85 +279,493 @@ export default {
     }
   },
   methods: {
-    handleChange(value, direction, movedKeys) {
-      console.log(value, direction, movedKeys);
+    /**
+     * 统计树节点下一级有多少在线数量
+     */
+    statisticsOnline(data) {
+      for (let i in data) {
+        console.log(data[i].abnormalStatus === undefined && data[i].children && data[i].children.length > 0)
+        if (data[i].abnormalStatus === undefined && data[i].children && data[i].children.length > 0) {
+          data[i].onlineData = data[i].children.filter(item => item.abnormalStatus === 1);
+        }
+      }
+    },
+    /**
+     * 树点击事件
+     */
+    nodeClick(data, node) {
+      if (data.children && data.children.length > 0 && data.abnormalStatus) {
+        this.simNodeData = data
+      } else if (data.children === undefined) {
+        this.simNodeData = node.parent.data
+        this.openPlay(data, this.playerIdx);
+      }
+    },
+    /**
+     * 模糊查询树
+     */
+    filterNode(value, data) {
+      console.log(data)
+      if (!value) return true;
+      return this.findSearKey(data, value)
+    },
+    /**
+     * 递归搜索父级是否包含关键字
+     */
+    findSearKey(node, key) {
+      if (node.name.indexOf(key) !== -1) {
+        return true;
+      } else {
+        if (node.parent === undefined || node.parent === null) {
+          return false;
+        } else {
+          return this.findSearKey(node.parent, key);
+        }
+      }
+    },
+    /**
+     * 处理返回的tree数据
+     */
+    processingTreeData(data, pid, parent) {
+      for (let i in data) {
+        data[i].pid = pid
+        data[i].parent = parent;
+        if (data[i].children || (Array.isArray(data[i].children) && data[i].abnormalStatus === undefined)) {
+          this.processingTreeData(data[i].children, data[i].id, data[i]);
+        } else {
+          data[i].name = data[i].code
+          if (data[i].abnormalStatus !== 1) {
+            data[i].disabled = true;
+            let targetValue = this.targetValue;
+            if (targetValue.length > 0) {
+              this.disableItemsByName(targetValue, data[i].name);
+            }
+          }
+          this.addChannels(data[i])
+        }
+      }
+    },
+    /**
+     * 原始sim列表数据 （用来验证视屏巡查车辆是否在线）
+     * @param data 查询后台树列表
+     */
+    processingSimList(data) {
+      if (data && data.length > 0) {
+        for (let i in data) {
+          if (data[i].children === undefined && data[i].abnormalStatus) {
+            this.simList.push(data[i]);
+          } else if (data[i].children && data[i].children.length > 0) {
+            this.processingSimList(data[i].children);
+          }
+        }
+      }
     },
-    //查询车辆信息
-    getCarInfo(){
+    /**
+     * 处理巡查列表数据
+     */
+    disableItemsByName(arr, targetName) {
+      arr.forEach(item => {
+        // 检查当前项是否是对象并且包含 name 属性且值为 targetName
+        if (item && typeof item === 'object' && item.name === targetName) {
+          item.disabled = true;
+        }
+        // 如果当前项有 children 属性且是数组，则递归调用自身
+        if (item && Array.isArray(item.children)) {
+          this.disableItemsByName(item.children, targetName);
+        }
+      });
+    },
+    /**
+     * 查询车辆信息
+     */
+    getCarInfoBuffer() {
+      this.loading = true;
+      this.getCarInfo()
+    },
+    getCarInfo() {
       this.$axios({
         method: 'get',
         url: `/api/jt1078/query/car/tree/100`,
-      }).then((res) => {
+      }).then(res => {
         if (res && res.data && res.data.data) {
           if (res.data.data.code == 1) {
-            l
-
-
-
+            //处理数据
+            this.simList = []
+            this.processingSimList(res.data.data.result)
+            this.processingTreeData(res.data.data.result, 0);
+            this.statisticsOnline(res.data.data.result)
+            console.log(res.data.data.result)
+            this.sourceValue = res.data.data.result;
+            this.loading = false
+            //定时更新数据
+            let this_ = this
             this.carInfoTimeout = setTimeout(function () {
-              this.getCarInfo()
-            }, 15000);
+              this_.getCarInfo()
+            }, 45000);
           } else if (res.data.data.message) {
             this.$message.error(res.data.data.message);
           }
         } else {
           this.$message.error("请求错误，请刷新再试");
         }
+        this.loading = false
+      }).catch(error => {
+        this.$message.error(error.message);
       })
     },
-    inspectionsDialog(){
-      if (this.nodes.length < 1) {
-
-      }
+    /**
+     * 打开巡查设置悬浮框
+     */
+    inspectionsDialog() {
       this.showVideoDialog = true
     },
-
-    //视频巡查按钮改变事件
-    videoPatrolChange(newValue) {
-      if (newValue) {
-        this.videoPatrolStart();
-      }else {
-        if (!this.isEmpty(this.timer)) {
-          //关闭巡查定时器
-          clearInterval(this.timer);
-        }
+    /**
+     * 添加通道
+     */
+    addChannels(data) {
+      let labels = ['ADAS', 'DSM', '路况', '司机', '整车前', '中门', '倒车', '前门客流', '后面客流'];
+      let children = [];
+      for (let i in labels) {
+        children.push({
+          id: `${data.id}_${data.sim}_${Number(i) + Number(1)}`,
+          pid: data.id,
+          name: labels[i],
+          disabled: data.disabled,
+          parent: data
+        })
+      }
+      data.children = children;
+    },
+    /**
+     * 巡查时间转换器
+     */
+    timerTimeConvertor() {
+      switch (this.timerTime) {
+        case "00:30":
+          return 30000
+        case "01:00":
+          return 30000 * 2
+        case "01:30":
+          return 30000 * 3
+        case "02:00":
+          return 30000 * 4
+        case "02:30":
+          return 30000 * 5
+        case "03:00":
+          return 30000 * 6
+        case "03:30":
+          return 30000 * 7
+        case "04:00":
+          return 30000 * 8
+        case "04:30":
+          return 30000 * 9
+        case "05:00":
+          return 30000 * 10
+        default:
+          return null
       }
     },
-    //开启巡查定时器
-    videoPatrolStart(itemData){
-      let onlineCarKeys = this.onlineCarKeys;
-      if (!onlineCarKeys  || onlineCarKeys.length === 0 ) {
-        this.$message.error("没有在线设备")
+    /**
+     * 巡查开启按钮
+     */
+    openInspections() {
+      let time = this.timerTimeConvertor();
+      this.spilt = this.patrolCell;
+      if (time == null) {
+        this.$message.error("时间选择错误 ==> [ " + this.timerTime + " ]")
+        console.log("时间选择结果为 ===> [ " + time + " ]")
+      }
+      let targetValue = this.targetValue;
+      if (targetValue === undefined || targetValue === null || targetValue.length === 0) {
+        this.$message.error("未选择巡查对象")
         return
       }
-      let count = this.onlineCarKeys.length - 1;
-      setInterval(() => {
-        if (itemData){
-          this.sendDevicePush(itemData);
-          itemData = null
-        }else {
-          if (count == -1){
-            count = this.onlineCarKeys.length - 1
+      this.startFetching(time)
+      this.showVideoDialog = false
+    },
+    /**
+     * 巡查树数组只获取最后一级的一维数组
+     * @param array 原数组
+     */
+    getLastElementsOfInnerArrays(array) {
+      const result = [];
+
+      //递归取值
+      function traverse(arr) {
+        for (let item of arr) {
+          let children = item.children;
+          if (children !== undefined && Array.isArray(children)) {
+            traverse(children);
+          } else if (children === undefined) {
+            result.push(item)
+          } else {
+            console.log("数据格式有误 ==> { " + item + " }")
+          }
+        }
+      }
+
+      //开启递归取值
+      traverse(array);
+      return result;
+    },
+    /**
+     * 巡查关闭按钮
+     */
+    closeInspections() {
+      this.stopPatrol()
+      this.patrolValue = false
+      clearInterval(this.fetchInterval);
+      let nowPlayArray = this.nowPlayArray;
+      for (let index in nowPlayArray) {
+        this.setPlayUrl(null, index)
+      }
+    },
+    /**
+     * 后台关闭视频巡查
+     */
+    stopPatrol() {
+      this.$axios({
+        method: 'get',
+        url: `/api/jt1078/query/stopPatrol/request/io`,
+      }).then((res) => {
+        if (res.data.code === 0) {
+          this.$message.success("视频巡查已关闭")
+        } else {
+          this.$message.error("视频巡查已关闭失败, 请联系管理员");
+        }
+      });
+    },
+    /**
+     * 后台开启视频巡查
+     */
+    startPatrol(data) {
+      this.$axios({
+        method: 'post',
+        url: `/api/jt1078/query/startPatrol/request/io`,
+        data: data,
+        headers: {
+          'Content-Type': 'application/json', // 设置请求头
+        }
+      }).then((res) => {
+        if (res.data.code === 0) {
+          console.log("视频巡查已开启 ===》 " + res.data.msg)
+          this.$message.success("视频巡查已开启");
+        } else {
+          console.log("视频巡查开启失败 ===》 " + res.data.msg)
+          this.$message.error("视频巡查开启失败, 请联系管理员");
+        }
+      });
+    },
+    /**
+     * 巡查对话框取消按钮
+     */
+    cancel() {
+      this.loading = true;
+      this.targetValue = [];
+      this.timerTime = '00:30'
+    },
+    /**
+     * 开启推流视频播放
+     */
+    openPlay(data, idxTmp, fun) {
+      console.log("开启视频播放入参数据 ===》 [ " + data + " ]")
+      let id = data.id;
+      if (id === undefined || id === null) {
+        console.log("id 内容为 :" + id)
+        return;
+      }
+      console.log("id 内容为 :" + id)
+      let arr = id.split('_');
+      if (arr === undefined || arr === null || arr.length !== 3) {
+        console.log("split 内容为 :" + arr)
+        return;
+      }
+      this.$axios({
+        method: 'get',
+        url: '/api/jt1078/query/send/request/io/' + arr[1] + '/' + arr[2]
+      }).then(res => {
+        if (res.data.code === 0 && res.data.data) {
+          let videoUrl;
+          this.downloadURL = res.data.data.flv;
+          if (location.protocol === "https:") {
+            videoUrl = res.data.data.wss_flv;
+          } else {
+            videoUrl = res.data.data.ws_flv;
           }
-          let onlineCarKey = onlineCarKeys[count];
-          let split = onlineCarKey.split("-");
-          let onlineCar = this.onlineCar.get(split[0])
-          let sim = onlineCar.sim
-          let data = {
-            channelId: split[1],
-            deviceId: sim,
-            sim: sim
+          data.playUrl = videoUrl;
+          this.setPlayUrl(videoUrl, idxTmp);
+        } else {
+          if (!this.isEmpty(res.data.data) && !this.isEmpty(res.data.data.msg)) {
+            this.$message.error(res.data.data.msg);
+          } else {
+            this.$message.error(res.data.msg);
           }
-          this.sendDevicePush(data);
-          count --;
         }
-      },30000)
+        if (fun) {
+          fun();
+        }
+      })
+    },
+    /**
+     * 批量开启推流视频播放
+     * @param data 视频推流参数集合 Array
+     */
+    // openBatchPlay(data) {
+    //   if (data === undefined || !Array.isArray(data)) {
+    //     return;
+    //   }
+    //   console.log("批量开启推流视频播放 ----》"+data)
+    //   let index = 0;
+    //   this.cycleBatchPlay(data, index)
+    // },
+    cycleBatchPlay(data, index) {
+      if (data === undefined || data[index] === undefined) {
+        return;
+      }
+      let this_i = this
+      this.openPlay(data[index], Number(index), function () {
+        index++
+        this_i.cycleBatchPlay(data, index)
+      });
+    },
+    /**
+     * 发送请求验证车辆是否在线
+     * @param item
+     * @returns {boolean|*}
+     */
+    checkStatus(item) {
+      if (this.lastTargetValueFilter.includes(item)) {
+        return true
+      }
+      if (this.simList) {
+        let find = this.simList.find(simData => simData.sim === item && simData.abnormalStatus !== 1);
+        //没找到则为离线 反之在线
+        console.log("find ===> " + find)
+        let f = (find === undefined)
+        if (f) {
+          this.lastTargetValueFilter.push(item)
+        }
+        return !f
+      }
+      return true; // 直接返回预定义的在线状态
+    },
+    /**
+     * 批量验证车辆在线情况
+     * @param items
+     * @returns {*}
+     */
+    validateItemsOnline(items) {
+      // 检查所有提供的 items 是否在线，并返回过滤后的在线 items
+      const onlineItems = items.filter(item => this.checkStatus(item.id.split('_')[1]));
+      if (onlineItems.length !== items.length) {
+        console.warn("有车辆下线");
+      }
+      this.nowPlayArray = items;
+      return onlineItems;
+    },
+    /**
+     * 循环从数组中取出一定数量的值
+     * @param array 原数组
+     * @param batchSize 取出的数量
+     * @returns {function(): *[]} 取出的结果
+     */
+    // createBatchFetcher(array, batchSize) {
+    //   let currentIndex = 0;
+    //   array = array.slice(); // 创建数组副本以避免修改原始数组
+    //   return function fetchNextBatch() {
+    //     const result = [];
+    //     for (let i = 0; i < batchSize; i++) {
+    //       if (currentIndex >= array.length) {
+    //         currentIndex = 0; // 当达到数组末尾时重置索引
+    //       }
+    //       result.push(array[currentIndex]);
+    //       currentIndex++;
+    //     }
+    //     return result;
+    //   };
+    // },
+    createBatchFetcher(array, batchSize) {
+      let currentIndex = 0;
+      const originalArray = array.slice(); // 创建原始数组副本
+
+      return function fetchNextBatch() {
+        const result = [];
+        for (let i = 0; i < batchSize && currentIndex < originalArray.length; i++) {
+          result.push(originalArray[currentIndex]);
+          currentIndex++;
+        }
+        return result;
+      };
+    },
+    /**
+     * 开启视频巡查
+     * @param items 选择巡查的对象
+     * @param time
+     */
+    startFetching(time) {
+      this.lastTargetValue = this.getLastElementsOfInnerArrays(this.targetValue);
+      console.log("targetValue ===> " + this.targetValue);
+      console.log("lastTargetValue ===> " + this.lastTargetValue);
+      if (!this.patrolValue && this.lastTargetValue.length > 0) {
+        // 在初始化 batchFetcher 之前验证 items 是否全部在线
+        this.lastTargetValue = this.validateItemsOnline(this.lastTargetValue);
+        if (this.lastTargetValue.length === 0) {
+          console.warn("【车辆全部下线】请重新选择");
+          return;
+        }
+        this.startPatrol(this.lastTargetValue)
+        this.batchFetcher = this.createBatchFetcher(this.lastTargetValue, this.spilt);
+        // 立即执行一次 fetchNextBatch 并等待其完成
+        let data = this.fetchNextBatch();
+        console.log(parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}') + " 视频巡查数组 ===》 " + data);
+        this.beachSendIORequest(this.convertBeachList(data));
+        // 设置定时器以定期获取批次
+        this.fetchInterval = setInterval(() => {
+          let data = this.fetchNextBatch();
+          console.log(parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}') + " 视频巡查数组 ===》 " + data);
+          this.beachSendIORequest(this.convertBeachList(data));
+        }, time);
+        this.patrolValue = true;
+      }
+    },
+    /**
+     * 数组转换 （方便批量发送请求）
+     */
+    convertBeachList(data) {
+      if (data && data.length > 0) {
+        return data.map(item => item.id.split('_').slice(1).join('-'))
+      }
+    },
+    /**
+     * 更新巡查播放列表
+     */
+    fetchNextBatch() {
+      // 在每次获取批次前验证在线状态
+      const updatedItems = this.validateItemsOnline(this.lastTargetValue);
+      if (updatedItems.length === 0) {
+        this.$message.error("车辆已全部下线，已关闭 【视屏巡查】")
+        this.stopFetching();
+        return
+      }
+      if (updatedItems.length !== this.lastTargetValue.length) {
+        // 更新 items 和 batchFetcher
+        this.lastTargetValue = updatedItems;
+        this.batchFetcher = this.createBatchFetcher(updatedItems, this.spilt);
+      }
+      const batch = this.batchFetcher();
+      this.nowPlayArray = batch;
+      return batch
+    },
+    /**
+     * 关闭视频巡查
+     */
+    stopFetching() {
+      if (this.isFetching) {
+        clearInterval(this.fetchInterval);
+        this.fetchInterval = null;
+        this.isFetching = false;
+      }
     },
-
-
-
-
-
     destroy(idx) {
       this.clear(idx.substring(idx.length - 1))
     },
@@ -313,73 +776,75 @@ export default {
           this.closeLoading();
           return false;
         } else {
-          this.isSendDevicePush(data,this.patrolValue);
+          this.isSendDevicePush(data, this.patrolValue);
         }
       }
     },
     contextMenuEvent: function (device, event, data, isCatalog) {
     },
     isSendDevicePush(itemData, patrolValue) {
-      if (patrolValue){
+      if (patrolValue) {
         this.videoPatrolStart(itemData);
-      }else {
+      } else {
         this.sendDevicePush(itemData);
       }
     },
     //通知设备上传媒体流
-    sendDevicePush: function (itemData, fun) {
-      // if (itemData.status === 0) {
-      //   this.$message.error('设备离线!');
-      //   return
-      // }
+    sendDevicePush(itemData, fun) {
       this.save(itemData)
       let deviceId = itemData.deviceId;
-      // this.isLoging = true;
       let channelId = itemData.channelId;
       if (this.isEmpty(deviceId)) {
         this.$message.error("没有获取到sim卡，请检查设备是否接入");
         this.closeLoading();
-        if (fun) {fun();}
+        if (fun) {
+          fun();
+        }
         return;
       }
       console.log("通知设备推流1：" + deviceId + " : " + channelId);
       let idxTmp = this.playerIdx
-      let that = this;
       this.$axios({
         method: 'get',
         url: '/api/jt1078/query/send/request/io/' + deviceId + '/' + channelId
-      }).then(function (res) {
-        if (res.data.code === 0 && res.data.data && (res.data.data.code === "1" || res.data.data.code == 1)) {
+      }).then(res => {
+        console.log(res)
+        if (res.data.code === 0 && res.data.data) {
           let videoUrl;
-          that.port = res.data.data.port;
-          that.httpPort = res.data.data.httpPort;
-          that.stream = res.data.data.stream;
-          console.log(res.data.data.data);
-          if (!that.isEmpty(res.data.data.data)) {
-            that.downloadURL = res.data.data.data.flv;
+          this.port = res.data.data.port;
+          this.httpPort = res.data.data.httpPort;
+          this.stream = res.data.data.stream;
+          console.log(res.data.data);
+          if (!this.isEmpty(res.data.data)) {
+            this.downloadURL = res.data.data.flv;
             if (location.protocol === "https:") {
-              videoUrl = res.data.data.data.wss_flv;
+              videoUrl = res.data.data.wss_flv;
             } else {
-              videoUrl = res.data.data.data.ws_flv;
+              videoUrl = res.data.data.ws_flv;
             }
             console.log(videoUrl);
             itemData.playUrl = videoUrl;
-            that.setPlayUrl(videoUrl, idxTmp);
+            this.setPlayUrl(videoUrl, idxTmp);
           }
         } else {
-          if (!that.isEmpty(res.data.data) && !that.isEmpty(res.data.data.msg)) {
-            that.$message.error(res.data.data.msg);
-          } else {
-            that.$message.error(res.data.msg);
-          }
+          this.$message.error(res.data.msg);
+        }
+        if (fun) {
+          fun();
         }
-        if (fun) {fun();}
       }).catch(function (e) {
-        if (fun) {fun();}
+        if (fun) {
+          fun();
+        }
       }).finally(() => {
         this.closeLoading();
       });
     },
+    /**
+     * 播放器赋值
+     * @param url 播放内容路径
+     * @param idx 播放的id
+     */
     setPlayUrl(url, idx) {
       this.$set(this.videoUrl, idx, url)
       let _this = this
@@ -394,7 +859,7 @@ export default {
       }
     },
     shot(e) {
-      // console.log(e)
+      console.log(e)
       // send({code:'image',data:e})
       var base64ToBlob = function (code) {
         let parts = code.split(';base64,');
@@ -430,6 +895,7 @@ export default {
       console.log(data);
       window.localStorage.setItem('playData', JSON.stringify(data))
     },
+
     initTreeData() {
       this.showLoading();
       this.$axios({
@@ -449,6 +915,7 @@ export default {
         this.closeLoading();
       });
     },
+
     initDate(nodes, datas) {
       if (nodes && datas) {
         let len = datas.length;
@@ -486,21 +953,10 @@ export default {
     onClick(evt, treeId, treeNode) {
       this.combationChildNode(treeNode);
     },
-    onCheck(evt, treeId, treeNode) {
-
-    },
     beforeExpand(treeId, treeNode) {
       return true;
     },
-    onExpand(evt, treeId, treeNode) {
-      this.combationChildNode(treeNode);
-    },
-    handleCreated(ztreeObj) {
-      this.ztreeObj = ztreeObj;
-      this.ztreeObj.setting.view.nameIsHTML = true;
-
-    },
     combationChildNode(treeNo) {
       this.ztreeNode = treeNo;
       if (treeNo.seachChild && (treeNo.seachChild == 'true')) {
@@ -561,6 +1017,9 @@ export default {
         this.closeLoading();
       }
     },
+    /**
+     * 添加通道
+     */
     addChannel(treeNo) {
       let labels = ['ADAS', 'DSM', '路况', '司机', '整车前', '中门', '倒车', '前门客流', '后面客流'];
       let children = [];
@@ -593,8 +1052,9 @@ export default {
               this.initDate(children, res.data.data.result);
               this.ztreeObj.addNodes(treeNo, -1, children, true);
               treeNo.seachChild = 'true';
+              let _this = this;
               this.carPlayTimer = setTimeout(function () {
-                this.requestChildNode1();
+                _this.requestChildNode1();
               }, 15000);
             } else if (res.data.data.message) {
               this.$message.error(res.data.data.message);
@@ -673,25 +1133,6 @@ export default {
         }
       });
     },
-    sendIORequestStop1(sim, channel, fun) {
-      if (this.isEmpty(sim) || this.isEmpty(channel)) {
-        console.log("sim:" + sim + ";channel:" + channel);
-        if (fun) {
-          fun();
-        }
-        return;
-      }
-      this.videoUrl = [''];
-      this.$axios({
-        method: 'get',
-        url: `/api/jt1078/query/send/stop/io/` + sim + "/" + channel,
-      }).then((res) => {
-        console.log(res);
-        if (fun) {
-          fun();
-        }
-      });
-    },
     isEmpty(val) {
       return null == val || undefined == val || "" == val;
     },
@@ -713,214 +1154,81 @@ export default {
         pageObj.closeLoading();
       }
     },
-    searchHitoryList(){
-        if(this.isEmpty(this.carTreeNode)){
-          this.$message.error('请选择车辆');
-          return;
-        }
-        if(this.isEmpty(this.sim)){
-          this.$message.error('无法获取SIM卡信息，请检查设备');
-          return;
-        }
-
-
-        if(this.isEmpty(this.channel)){
-          this.$message.error('请选择通道');
-          return;
-        }
-
-        if(this.isEmpty(this.startTime)){
-          this.$message.error('请选择开始时间');
-          return;
-        }
-
-        if(this.isEmpty(this.endTime)){
-          this.$message.error('请选择结束时间');
-          return;
-        }
-
-        this.showLoading();
-
-        let pageObj = this;
-        this.$axios({
-          method: 'get',
-          url: '/api/jt1078/query/history/list/' + this.sim + '/' + this.channel+"/"+this.startTime+"/"+this.endTime
-      }).then(function (res) {
-
-
-          if(res &&res.data && res.data.data && res.data.data.obj && res.data.data.code==1 && res.data.data.obj.data && res.data.data.obj.data.items){
-            let length = res.data.data.obj.data.items.length;
-            let html = "<div class='historyListDiv'><ul>";
-            for (let i = 0; i < length; i++) {
-              let item =  res.data.data.obj.data.items[i];
-              if(item.channelNo === pageObj.channel){
-                let title = item.startTime+"——"+item.endTime;
-                html+="<li class='historyListLi' click='playHistoryItem()' startTime = '"+item.startTime+"'  endTime='"+item.endTime+"' streamType='"+item.streamType+"' title='"+title+"' channelMapping='"+item.channelMapping+"'>"+title+"</li>";
-              }
-            }
-            pageObj.historyPlayListHtml = html+"</ul></div>";
-            pageObj.closeLoading();
-          }else if(res && res.data && res.data.data && res.data.data.msg){
-            pageObj.$message.error(res.data.data.msg);
-            pageObj.closeLoading();
-          }else{
-            pageObj.closeLoading();
-          }
-      });
-      },
-    playHistoryItem(e){
-      if(this.isEmpty(this.carTreeNode)){
-        this.$message.error('请选择车辆');
-        return;
-      }
-      if(this.isEmpty(this.sim)){
-        this.$message.error('无法获取SIM卡信息，请检查设备');
-        return;
-      }
-
-
-      if(this.isEmpty(this.channel)){
-        this.$message.error('请选择通道');
-        return;
-      }
-
-      if(this.isEmpty(this.startTime)){
-        this.$message.error('请选择开始时间');
-        return;
-      }
-
-      if(this.isEmpty(this.endTime)){
-        this.$message.error('请选择结束时间');
-        return;
-      }
-
-      let pageObj = this;
-
-
-      this.videoUrl =[];
-
-
-      pageObj.$axios({
-        method: 'get',
-        url: '/api/jt1078/query/send/request/io/history/' + pageObj.sim + '/' + pageObj.channel+"/"+e.target.getAttribute('startTime')+"/"+e.target.getAttribute('endTime')+"/"+e.target.getAttribute('channelMapping')
-      }).then(function (res) {
-
-
-        if (res.data && res.data.data && res.data.data.data) {
-          let videoUrl1;
-          if (location.protocol === "https:") {
-            videoUrl1 = res.data.data.data.wss_flv;
-          } else {
-            videoUrl1 = res.data.data.data.ws_flv;
-          }
-          pageObj.downloadURL = res.data.data.data.flv;
-          pageObj.port=res.data.data.port;
-          pageObj.httpPort = res.data.data.httpPort;
-          pageObj.stream = res.data.data.stream;
-          pageObj.videoUrlHistory = videoUrl1;
-
-          let itemData = new Object();
-          itemData.deviceId = pageObj.sim;
-          // this.isLoging = true;
-          itemData.channelId= pageObj.channel;
-          itemData.playUrl = videoUrl1;
-          console.log(pageObj.playerIdx);
-
-          pageObj.setPlayUrl(videoUrl1, 0);
-          pageObj.hisotoryPlayFlag = true;
-          // pageObj.$nextTick(() => {
-          //   pageObj.createdPlay();
-          //   pageObj.closeLoading();
-          // })
-        } else if(res.data.data && res.data.data.msg){
-          pageObj.$message.error(res.data.data.msg);
-        } else if(res.data.msg){
-          pageObj.$message.error(res.data.msg);
-        }else if(res.msg){
-          pageObj.$message.error(res.msg);
-        }
-        pageObj.closeLoading();
-      });
-
-    },
+    /**
+     * 视频一键播放
+     */
     oneClickPlayback() {
-      if (this.isEmpty(this.carTreeNode)) {
+      if (this.isEmpty(this.simNodeData)) {
         this.$message.error('请选择车辆');
         return;
       }
-      if (this.isEmpty(this.carTreeNode.abnormalStatus)) {
+      if (this.isEmpty(this.simNodeData.abnormalStatus)) {
         this.$message.error('请检查车辆状态');
         return;
       }
-      if (this.carTreeNode.abnormalStatus != 1) {
+      if (this.simNodeData.abnormalStatus != 1) {
         this.$message.error('车辆设备离线，请检查设备');
         return;
       }
-      if (this.isEmpty(this.sim)) {
+      if (this.isEmpty(this.simNodeData.sim)) {
         this.$message.error('无法获取SIM卡信息，请检查设备');
         return;
       }
-      this.spilt = 12;
-      this.playOneAllChannel(0);
+      this.spilt = 9;
+      let data = Array.from({length: this.spilt}, (_, i) => `${this.simNodeData.sim}-${i + 1}`);
+      this.beachSendIORequest(data);
     },
-    playOneAllChannel(channel) {
-      if (channel == 9) {
-        return;
-      }
-      let item = new Object();
-      item.deviceId = this.sim;
-      item.channelId = 1 + channel;
-      this.playerIdx = channel;
-      let that = this;
-      this.sendDevicePush(item, function () {
-        that.playOneAllChannel(1 + channel);
-      });
+    /**
+     * 批量发送推流请求
+     * @param data
+     */
+    beachSendIORequest(data) {
+      console.log(data)
+      this.$axios({
+        method: 'post',
+        url: '/api/jt1078/query/beachSend/request/io',
+        data: data,
+        headers: {
+          'Content-Type': 'application/json', // 设置请求头
+        }
+      }).then(
+        res => {
+          let dataList = res.data.data;
+          console.log(dataList);
+          if (res.data.code == 0 && dataList != null && dataList.length >= 0) {
+            for (let i in dataList) {
+              this.setPlayUrl(dataList[i].ws_flv, i);
+            }
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }
+      )
     },
+    // playOneAllChannel(channel) {
+    //   if (channel == 9) {
+    //     return;
+    //   }
+    //   let item = new Object();
+    //   item.deviceId = this.sim;
+    //   item.channelId = 1 + channel;
+    //   this.playerIdx = channel;
+    //
+    //   this.sendDevicePush(item);
+    // },
     spiltClickFun(val) {
       this.spilt = val;
       if (val - 1 < this.playerIdx) {
         this.playerIdx = val - 1;
       }
     },
-    downloadFunction(){
-      console.log(this.downloadURL);
-
-      if(this.isEmpty(this.downloadURL)){
-        return;
-      }
-
-      window.open(this.downloadURL,"_download");
-    },
-
     closeSelectItem() {
       console.log("============================>" + this.playerIdx);
       this.setPlayUrl(null, this.playerIdx)
-      // this.videoUrl[this.playerIdx]=null;
-      // this.sendIORequestStop1(this.sim,this.playerIdx+1);
     },
     closeSelectCarItem() {
       for (let index = 0; index < 9; index++) {
         this.setPlayUrl(null, index)
-        // this.videoUrl[this.playerIdx]=null;
-        this.sendIORequestStop1(this.sim, index + 1);
-      }
-    },
-    treeRightMenuFun(event, treeId, treeNode) {
-      if (treeNode.type == '301' || treeNode.type == 301) {
-        this.rightMenuId = "carRMenu";
-        this.showRMenu(event);
-        this.carTreeNode = treeNode;
-        this.sim = treeNode.sim;
-        this.channel = null;
-      } else if (treeNode.type == '401' || treeNode.type == 401) {
-        this.rightMenuId = "channelCarRMenu";
-        this.showRMenu(event);
-        this.channel = treeNode.id;
-      } else {
-        this.carTreeNode = null;
-        this.sim = null;
-        this.channel = null;
-        hidden();
       }
     },
     showRMenu(event) {
@@ -947,14 +1255,26 @@ export default {
   }
 };
 </script>
-<style>
+<style scoped>
+.inspections-tree >>> .el-tree {
+  padding-bottom: 22px;
+}
+
+.device-list-tree >>> .el-tree {
+  padding-bottom: 13px;
+}
+
+.device-list-tree >>> .el-tree-node__content {
+  padding-bottom: 13px;
+  height: 20px;
+}
+
 .device-tree-main-box {
   text-align: left;
 }
 .btn {
   margin: 0 10px;
-
 }
 .btn:hover {
@@ -963,7 +1283,6 @@ export default {
 .btn.active {
   color: #409EFF;
-
 }
 .redborder {
@@ -995,7 +1314,6 @@ export default {
   overflow-x: hidden;
 }
-
 /* 菜单的样式 */
 .rMenu {
   position: absolute;
@@ -1026,8 +1344,7 @@ export default {
 li#menu-item-delete, li#menu-item-rename {
   margin-top: 1px;
 }
-</style>
-<style>
+
 .videoList {
   display: flex;
   flex-wrap: wrap;
@@ -1106,6 +1423,7 @@ li#menu-item-delete, li#menu-item-rename {
   overflow-y: auto; /* 内容超出时显示垂直滚动条 */
   overflow-x: hidden; /* 隐藏水平滚动条 */
 }
+
 .transfer-footer {
   margin-left: 20px;
   padding: 6px 5px;
+<template>
+  <div style="width: 2000px;">
+    <el-container v-loading="loading" style="height: 100%;width: 100%" element-loading-text="拼命加载中">
+      <div style="width:100%;display: flex;flex-direction: column;justify-content: space-between;">
+        <div class="block" style="width: 100%;text-align:left;margin-bottom:15px;">
+          <el-card class="box-card" style="width: 100%">
+            <el-form>
+              <el-col :span="4">
+                <el-form-item label="时间类型">
+                  <el-select v-model="timeType" placeholder="请选择时间类型">
+                    <el-option
+                      v-for="item in timeList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                      @change="getDatesByTimeFrame">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="日期">
+                  <el-date-picker
+                    v-model="time"
+                    align="right"
+                    type="date"
+                    placeholder="选择日期"
+                    :picker-options="pickerOptions" v-if="timeType === 'day'"/>
+                  <el-date-picker
+                    v-model="time"
+                    value-format="yyyy-M"
+                    type="month"
+                    placeholder="选择月" v-if="timeType === 'month'"/>
+                  <el-date-picker
+                    v-model="time"
+                    type="year"
+                    placeholder="选择年" v-if="timeType === 'year'"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" v-if="statisticsType !== 'All'">
+                <el-form-item label="车辆">
+                  <car-tree-one v-model="sim_channel"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="统计类型">
+                  <el-select v-model="statisticsType" placeholder="请选择统计类型" @change="searchFlowList">
+                    <el-option
+                      v-for="item in statisticsList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3">
+                <el-form-item>
+                  <el-button @click="searchFlowList()">搜索</el-button>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </el-card>
+        </div>
+        <div style="width: 100%;display:flex;flex-direction:row; justify-content:space-between;">
+          <el-card class="box-card" style="width: 100%;height: 80vh">
+            <el-table
+              :data="tableData"
+              height="250"
+              border
+              style="width: 100%;height: 75vh;">
+              <el-table-column
+                prop="time"
+                label="日期"
+              >
+              </el-table-column>
+              <el-table-column
+                label="车辆自编号" v-if="statisticsType !== 'All'">
+                <template slot-scope="scope">
+                  <span>{{ `${scope.row.carData.nbbm}  ` }}</span>
+                  <el-button type="text" @click="clickInformation(scope.row)">[详细信息]</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="channel"
+                label="通道号"
+                v-if="statisticsType === 'channel'">
+              </el-table-column>
+              <el-table-column
+                prop="count"
+                label="统计车辆数"
+                v-if="statisticsType === 'All'">
+              </el-table-column>
+              <el-table-column
+                prop="flow"
+                label="流量">
+                <template slot-scope="scope">
+                  {{ formattedBytes(scope.row.flow) }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </div>
+      </div>
+      <el-dialog
+        :title="`${information.nbbm}车辆详细信息`"
+        :visible.sync="open"
+        width="30%"
+        :before-close="handleClose">
+        <el-descriptions class="margin-top"  :column="1"  border>
+          <el-descriptions-item>
+            <template slot="label">
+              车辆自编号
+            </template>
+            {{ information.nbbm }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              sim卡号
+            </template>
+            {{ information.sim }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="information.lineName">
+            <template slot="label">
+              线路名称
+            </template>
+            {{ information.lineName }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="information.carPlate">
+            <template slot="label">
+              <i class="el-icon-tickets"></i>
+              车牌号
+            </template>
+            {{ information.carPlate }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="closeInformation">关闭</el-button>
+        </span>
+      </el-dialog>
+    </el-container>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+import player from "./common/jessibuca.vue";
+import CarTree from "./JT1078Components/cascader/CarTree.vue";
+import HistoricalData from "./JT1078Components/historical/HistoricalDataTree.vue";
+import {parseTime} from "../../utils/ruoyi";
+import CarTreeOne from "./JT1078Components/cascader/CarTreeOne.vue";
+
+export default {
+  //import引入的组件需要注入到对象中才能使用"
+  components: {CarTreeOne, HistoricalData, CarTree, player},
+  props: {},
+  data() {
+    //这里存放数据"
+    return {
+      open: false,
+      information: {},
+      tableData: [],
+      historyData: [],
+      //遮罩层
+      loading: false,
+      //sim号和通道号，格式为：sim-channel
+      sim_channel: null,
+      //选择时间
+      time: '',
+      //时间类型
+      timeType: 'day',
+      //统计类型
+      statisticsType: 'sim',
+      //时间选择下拉框
+      timeList: [
+        {value: 'day', label: '按天统计'},
+        {value: 'month', label: '按月统计'},
+        {value: 'year', label: '按年统计'},
+      ],
+      //统计类型
+      statisticsList: [
+        {value: 'sim', label: '按车辆统计'},
+        {value: 'channel', label: '按通道统计'},
+        {value: 'All', label: '全量统计'},
+      ],
+      //日期快捷选择
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+        shortcuts: [{
+          text: '今天',
+          onClick(picker) {
+            picker.$emit('pick', new Date());
+          }
+        }, {
+          text: '昨天',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            picker.$emit('pick', date);
+          }
+        }, {
+          text: '一周前',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', date);
+          }
+        }]
+      },
+    };
+  },
+  //计算属性 类似于data概念",
+  computed: {},
+  //监控data中的数据变化",
+  watch: {
+    timeType() {
+      this.getDatesByTimeFrame()
+    }
+  },
+  //方法集合",
+  methods: {
+    /**
+     * 搜索流量统计数据
+     */
+    searchFlowList() {
+      this.loading = true
+      let simChannel = null;
+      console.log(this.sim_channel);
+      if (this.sim_channel) {
+        simChannel = this.sim_channel[this.sim_channel.length - 1];
+      }
+      this.$axios({
+        method: "GET",
+        url: "/flow/list/" + this.timeType + "/" + this.statisticsType + "/" + this.time + "/" + simChannel,
+      }).then(res => {
+        this.tableData = res.data.data
+        this.loading = false
+      })
+    },
+    destroy(idx) {
+      console.log(idx);
+      this.clear(idx.substring(idx.length - 1))
+    },
+    /**
+     * 获取时间
+     */
+    getDatesByTimeFrame() {
+      const today = new Date();
+      switch (this.timeType.toLowerCase()) {
+        case 'day':
+          this.time = parseTime(today, '{y}-{m}-{d} {h}:{i}:{s}');
+          break;
+
+        case 'month':
+          let time = parseTime(today, '{y}-{m}');
+          let split = time.split('-');
+          this.time = split[1].substring(0, 1) === '0' ? split[0] + '-' + split[1].substring(1, 2) : time;
+          break;
+
+        case 'year':
+          this.time = parseTime(today, '{y}');
+          break;
+        default:
+          console.log('Invalid time frame provided.');
+      }
+      this.searchFlowList()
+    },
+    /**
+     * 流量换算
+     */
+    formattedBytes(value) {
+      if (value >= 1024 * 1024 * 1024) { // GB
+        return `${(value / (1024 * 1024 * 1024)).toFixed(2)} GB`;
+      } else if (value >= 1024 * 1024) { // MB
+        return `${(value / (1024 * 1024)).toFixed(2)} MB`;
+      } else if (value >= 1024) { // KB
+        return `${(value / 1024).toFixed(2)} KB`;
+      } else { // Bytes
+        return `${value} Bytes`;
+      }
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {
+        });
+    },
+    /**
+     * 详细信息按钮
+     */
+    clickInformation(val) {
+      if (val) {
+        this.open = true;
+        this.information = val.carData
+      } else {
+        this.$message.error("车辆信息有误")
+      }
+    },
+    /**
+     * 关闭框
+     */
+    closeInformation() {
+      this.open = false;
+      this.information = {};
+    }
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.getDatesByTimeFrame()
+    this.searchFlowList();
+  },
+  //生命周期 - 挂载完成（可以访问DOM元素）",
+  mounted() {
+  },
+  beforeCreate() {
+  }, //生命周期 - 创建之前",
+  beforeMount() {
+  }, //生命周期 - 挂载之前",
+  beforeUpdate() {
+  }, //生命周期 - 更新之前",
+  updated() {
+  }, //生命周期 - 更新之后",
+  beforeDestroy() {
+  }, //生命周期 - 销毁之前",
+  destroyed() {
+  }, //生命周期 - 销毁完成",
+  activated() {
+  } //如果页面有keep-alive缓存功能，这个函数会触发",
+};
+</script>
+<style scoped>
+.device-tree-main-box {
+  text-align: left;
+}
+
+.btn {
+  margin: 0 10px;
+
+}
+
+.btn:hover {
+  color: #409EFF;
+}
+
+.btn.active {
+  color: #409EFF;
+
+}
+
+.redborder {
+  border: 2px solid red !important;
+}
+
+.play-box {
+  background-color: #000000;
+  border: 2px solid #505050;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.historyListLi {
+  width: 97%;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  cursor: pointer;
+  padding: 3px;
+  margin-bottom: 6px;
+  border: 1px solid #000000;
+}
+
+.historyListDiv {
+  height: 80vh;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+
+/* 菜单的样式 */
+.rMenu {
+  position: absolute;
+  top: 0;
+  display: none;
+  margin: 0;
+  padding: 0;
+  text-align: left;
+  border: 1px solid #BFBFBF;
+  border-radius: 3px;
+  background-color: #EEE;
+  box-shadow: 0 0 10px #AAA;
+}
+
+.rMenu li {
+  width: 170px;
+  list-style: none outside none;
+  cursor: default;
+  color: #666;
+  margin-left: -20px;
+}
+
+.rMenu li:hover {
+  color: #EEE;
+  background-color: #666;
+}
+
+li#menu-item-delete, li#menu-item-rename {
+  margin-top: 1px;
+}
+</style>
+<style>
+.videoList {
+  display: flex;
+  flex-wrap: wrap;
+  align-content: flex-start;
+}
+
+.video-item {
+  position: relative;
+  width: 15rem;
+  height: 10rem;
+  margin-right: 1rem;
+  background-color: #000000;
+}
+
+.video-item-img {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 100%;
+  height: 100%;
+}
+
+.video-item-img:after {
+  content: "";
+  display: inline-block;
+  position: absolute;
+  z-index: 2;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  width: 3rem;
+  height: 3rem;
+  background-image: url("../assets/loading.png");
+  background-size: cover;
+  background-color: #000000;
+}
+
+.video-item-title {
+  position: absolute;
+  bottom: 0;
+  color: #000000;
+  background-color: #ffffff;
+  line-height: 1.5rem;
+  padding: 0.3rem;
+  width: 14.4rem;
+}
+
+.baidumap {
+  width: 100%;
+  height: 100%;
+  border: none;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+}
+
+/* 去除百度地图版权那行字 和 百度logo */
+.baidumap > .BMap_cpyCtrl {
+  display: none !important;
+}
+
+.baidumap > .anchorBL {
+  display: none !important;
+}
+</style>
@@ -4,7 +4,7 @@
       <div style="width:100%;display: flex;flex-direction: column;justify-content: space-between;">
         <div class="block" style="width: 99%;text-align:left;margin-bottom:15px;">
           <el-card class="box-card" style="width: 100%">
-            <car-tree v-model="sim_channel"/>
+            <car-tree v-model="sim_channel" />
             <el-date-picker
               v-model="date"
               align="right"
@@ -26,14 +26,14 @@
         </div>
         <div style="width: 100%;display:flex;flex-direction:row; justify-content:space-between;">
-          <div style="width:20%;height: 80vh" >
+          <div style="width:22%;height: 80vh" >
             <historical-data :history-data="historyData" @click="clickHistoricalPlay" />
           </div>
-          <div style="width: 78%;">
+          <div style="width: 77%;">
             <div style="width: 99%;height: 80vh;display: flex;flex-wrap: wrap;background-color: #000;">
-                  <div v-if="!videoUrl[0]" style="color: #ffffff;font-size: 30px;font-weight: bold;"></div>
-                  <player ref="player" v-else :videoUrl="videoUrl[0]" fluent autoplay @screenshot="shot"
-                          @destroy="destroy" style="width: 100%;height: 100%;"/>
+              <div v-if="!videoUrl[0]" style="color: #ffffff;font-size: 30px;font-weight: bold;"></div>
+              <player ref="player" v-else :videoUrl="videoUrl[0]" fluent autoplay @screenshot="shot"
+                      @destroy="destroy" style="width: 100%;height: 100%;"/>
             </div>
           </div>
         </div>
@@ -109,10 +109,6 @@ export default {
     clickHistoricalPlay(data) {
       this.playHistoryItem(data)
     },
-    simChannelChange(val) {
-      console.log(val);
-      console.log(this.sim_channel)
-    },
     /**
      * 下载历史视频
      */
@@ -135,6 +131,7 @@ export default {
         return;
       }
       let split = simChannel[simChannel.length - 1].split('-');
+      console.log("simChannel:",simChannel)
       let sim = split[0];
       if (this.isEmpty(sim)) {
         this.$message.error('无法获取SIM卡信息，请检查设备');
@@ -155,13 +152,16 @@ export default {
         url: '/api/jt1078/query/history/list/' + sim + '/' + channel + "/" + this.startTime + "/" + this.endTime
       }).then(
         res=>{
+          console.log(res.data)
           let items = res.data.data.obj.data.items;
           if (res && res.data && res.data.data && res.data.data.obj && res.data.data.code == 1 && res.data.data.obj.data && items) {
             for (let i in items) {
-              items[i].sim = res.data.data.obj.data.clientId;
+              items[i].sim = sim;
+              items[i].channel = channel
               items[i].name = items[i].startTime + '-' + items[i].endTime;
             }
             this.historyData = items
+            console.log(this.historyData)
             this.loading = false
           } else if (res && res.data && res.data.data && res.data.data.msg) {
             this.$message.error(res.data.data.msg);
@@ -169,7 +169,10 @@ export default {
           } else {
             this.loading = false
           }
-        });
+        }).cache(res => {
+          this.$message.error(res.msg);
+        this.loading = false
+      })
     },
     /**
      * 时间转换
@@ -213,7 +216,7 @@ export default {
       this.videoUrl = [];
       this.$axios({
         method: 'get',
-        url: '/api/jt1078/query/send/request/io/history/' + e.sim + '/' + e.channelNo + "/" + e.startTime + "/" + e.endTime + "/" + e.channelMapping
+        url: '/api/jt1078/query/send/request/io/history/' + e.sim + '/' + e.channel + "/" + e.startTime + "/" + e.endTime + "/" + e.channelMapping
       }).then(res=> {
         if (res.data && res.data.data && res.data.data.data) {
           let videoUrl1;
@@ -73,6 +73,7 @@
             if (res.data.data.code == 1) {
               let data1 = res.data.data.result;
               this.addChannel(data1);
+              console.log(data1)
             } else if (res.data.data.message) {
               this.$message.error(res.data.data.message);
             }
+<template>
+  <el-cascader
+    placeholder="请选择/搜索车辆"
+    :options="options"
+    filterable
+    clearable
+    :props="prop"
+    v-model="valueList"
+    @change="getValue">
+  </el-cascader>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+  export default {
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {
+      value: {
+        type: Array,
+        default: []
+      }
+    },
+    data() {
+      //这里存放数据"
+      return {
+        options: [],
+        prop: {
+          value: 'sim',
+          label: `name`,
+          children: 'children'
+        },
+
+      };
+    },
+    //计算属性 类似于data概念",
+    computed: {
+      valueList: {
+        get(){
+          let value = this.value;
+          if (value || value === null || value.length === 0) {
+            return value
+          }
+          return value[ value.length - 1 ];
+        },
+        set(val){
+          if (val || val === null || val.length === 0) {
+            this.$emit("input",val)
+          }
+          return val[ val.length - 1 ]
+        }
+      }
+    },
+    //监控data中的数据变化",
+    watch: {},
+    //方法集合",
+    methods: {
+      getValue(val){
+        console.log(val)
+      },
+      /**
+       * 查询级联数据列表
+       */
+      initTreeData() {
+        this.$axios({
+          method: 'get',
+          url: `/api/jt1078/query/car/tree/` + 100,
+        }).then((res) => {
+          if (res && res.data && res.data.data) {
+            if (res.data.data.code == 1) {
+              let data1 = res.data.data.result;
+              this.addChannel(data1);
+              console.log(data1)
+            } else if (res.data.data.message) {
+              this.$message.error(res.data.data.message);
+            }
+          } else {
+            this.$message.error("请求错误，请刷新再试");
+          }
+
+        });
+      },
+      /**
+       * 整理数据结构
+       * @param treeNo
+       */
+      addChannel(data) {
+        for (let i in data) {
+          if (data[i] && data[i].sim){
+            data[i].name = data[i].code;
+          }else if (data[i].children && data[i].children.length > 0){
+            this.addChannel(data[i].children);
+          }
+        }
+        this.options = data
+      },
+    },
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+        this.initTreeData();
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>
+<template>
+  <div class="device-tree-main-box">
+    <div id="DeviceTree" style="width: 100%;height: 100%; background-color: #FFFFFF; overflow: auto">
+      <el-container>
+        <el-header>设备列表</el-header>
+        <el-main style="background-color: #ffffff;">
+          <el-input
+            placeholder="输入关键字进行过滤"
+            v-model="filterText">
+          </el-input>
+          <el-tree
+            class="filter-tree"
+            :data="treeData"
+            :props="defaultProps"
+            :default-expanded-keys="expandedKeys"
+            node-key="id"
+            ref="tree"
+            :filter-node-method="filterNode"
+            :check-strictly="true"
+            @node-click="nodeClick"
+            @node-contextmenu="nodeContextmenu"
+            @node-expand="handleNodeExpand"
+            @node-collapse="handleNodeCollapse"
+            style="margin-top: 10px"
+          >
+            <span class="custom-tree-node" slot-scope="{ node, data }">
+              <span v-if="data.abnormalStatus !== undefined && data.children && data.abnormalStatus === 1">
+                  <i class="el-icon-location" style="color: #409EFF"></i>{{ `${data.name}（在线）` }}
+              </span>
+              <span v-if="data.abnormalStatus !== undefined && data.abnormalStatus === 20">
+                  <i class="el-icon-location" style="color: #909399"></i>{{ `${data.name}（离线）` }}
+              </span>
+              <span v-if="data.abnormalStatus !== undefined && data.abnormalStatus === 10">
+                  <i class="el-icon-location" style="color: #909399"></i>{{ `${data.name}（未接入）` }}
+              </span>
+              <span v-if="data.abnormalStatus === undefined && data.children ">
+                  {{ `${data.name}（${data.onlineData.length}/${data.children.length}）` }}
+              </span>
+              <span v-if="data.abnormalStatus === undefined && data.children === undefined ">
+                  <i class="el-icon-video-camera-solid">&nbsp;&nbsp;</i>{{ `${data.name}` }}
+              </span>
+            </span>
+          </el-tree>
+        </el-main>
+      </el-container>
+    </div>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+
+export default {
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {
+      //树 数据
+      treeData: {
+        type: Array,
+        default: []
+      },
+    },
+    data() {
+      //这里存放数据"
+      return {
+        //搜索值
+        filterText: '',
+        //默认的prop
+        defaultProps: {
+          label: 'name',
+          children: 'children',
+        },
+        pointsList: [],
+        expandedKeys: []
+      };
+    },
+    //计算属性 类似于data概念",
+    computed: {
+    },
+    //监控data中的数据变化",
+    watch: {
+      filterText(val) {
+        this.$refs.tree.filter(val);
+      },
+      treeData(val) {
+        console.log(val);
+        this.treeData = val
+      }
+    },
+    //方法集合",
+    methods: {
+      handleNodeExpand(data, node, el) {
+        if (!this.expandedKeys.includes(node.key)) {
+          this.expandedKeys.push(node.key);
+        }
+      },
+      handleNodeCollapse(data, node, el) {
+        const index = this.expandedKeys.indexOf(node.key);
+        if (index > -1) {
+          this.expandedKeys.splice(index, 1);
+        }
+      },
+      /**
+       * 模糊查询树
+       */
+      filterNode(value, data, node) {
+        if (!value) return true;
+        return this.findSearKey(node, value)
+      },
+      /**
+       * 点击事件
+       */
+      nodeClick(data, node, fun){
+        console.log(data)
+        console.log("node ===> ", node)
+        this.$emit('node-click', data, node);
+      },
+      nodeContextmenu(event, data, node, fun){
+
+      },
+      //递归搜索父级是否包含关键字
+      findSearKey(node, key) {
+        if (node.label.indexOf(key) !== -1) {
+          return true;
+        } else {
+          if (node.parent.parent == null) {
+            return false;
+          } else {
+            return this.findSearKey(node.parent, key);
+          }
+        }
+      },
+    },
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 6000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    },
+    data: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption()
+    }
+  }
+}
+</script>
 <template>
-  <el-card class="box-card" style="width: 100%;height: 100%">
-    <el-tree v-if="historyData.length > 0" :data="historyData">
-      <span class="custom-tree-node" slot-scope="{ node , data }">
-        <span>
-          <el-button @click="clickButton(data)" style="margin-top: 30px;margin-left: -12px">{{ data.name }}</el-button>
-        </span>
-      </span>
-    </el-tree>
-    <el-empty v-else></el-empty>
-  </el-card>
+  <div style="width: 100%;height: 80vh" class="page-container">
+    <el-card class="box-card" >
+      <div class="scroll-container">
+        <el-scrollbar style="height: 79vh">
+          <el-tree v-if="historyData.length > 0" :data="historyData" class="historical-list-tree">
+            <span class="custom-tree-node" slot-scope="{ node , data }">
+              <el-button @click="clickButton(data)" >{{ data.name }}</el-button>
+            </span>
+          </el-tree>
+          <el-empty v-else></el-empty>
+        </el-scrollbar>
+      </div>
+    </el-card>
+  </div>
 </template>
 <script>
 export default {
   name: 'historical-data',
   props: {
-    historyData: {}
+    historyData: {
+      type: Array,
+      default: []
+    }
   },
   //计算属性 类似于data概念",
   computed: {},
@@ -49,11 +56,23 @@ export default {
   } //如果页面有keep-alive缓存功能，这个函数会触发",
 };
 </script>
-<style>
-
+<style scoped>
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: 100vh; /* 视口高度的 100% */
+}
+.box-card {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+}
+.scroll-container {
+  flex-grow: 1;
+  overflow: hidden; /* 确保内容不会溢出 */
+}
 /* 菜单的样式 */
-
 .rMenu li {
   width: 170px;
   list-style: none outside none;
@@ -66,9 +85,11 @@ export default {
   color: #EEE;
   background-color: #666;
 }
-.el-tree-node__content {
-  padding-bottom: 30px;
+.historical-list-tree >>> .el-tree-node__content {
+  padding: 15px;
   height: 20px;
 }
-
+.historical-list-tree {
+ margin: 10px 0 20px 0;
+}
 </style>
@@ -11,8 +11,6 @@
       </div>
       <div class="buttons-box-right">
         <span class="jessibuca-btn">{{ kBps }} kb/s</span>
-        <!--          <i class="iconfont icon-file-record1 jessibuca-btn"></i>-->
-        <!--          <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>-->
         <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="screenshot"
           style="font-size: 1rem !important"></i>
         <i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
@@ -156,7 +154,7 @@ export default {
       let _this = this;
       jessibuca.on("pause", function () {
         _this.playing = false;
-        
+
       });
       jessibuca.on("play", function () {
         _this.playing = true;
@@ -65,7 +65,7 @@ import consoleNodeLoad from &#39;./console/ConsoleNodeLoad.vue&#39;
 import consoleDisk from './console/ConsoleDisk.vue'
 import consoleResource from './console/ConsoleResource.vue'
 import configInfo from './dialog/configInfo.vue'
-
+import consoleFlow from './console/ConsoleFlow.vue'
 import echarts from 'echarts';
 export default {
@@ -80,6 +80,7 @@ export default {
     consoleDisk,
     consoleResource,
     configInfo,
+    consoleFlow,
   },
   data() {
     return {
+<template>
+  <div id="ConsoleNodeLoad" style="width: 100%; height: 100%; background: #FFFFFF; text-align: center">
+    <car-tree :value="value" />
+    <ve-histogram ref="consoleNodeLoad" :data="chartData" :extend="extend"  :settings="chartSettings" width="100%" height="100%" :legend-visible="true"></ve-histogram>
+  </div>
+</template>
+
+<script>
+
+import CarTree from "../JT1078Components/cascader/CarTree.vue";
+
+export default {
+  name: 'ConsoleNodeLoad',
+  components: {CarTree},
+  data() {
+    return {
+      value: null,
+      chartData: {
+        columns: [],
+        rows: []
+      },
+      chartSettings: {
+        labelMap: {},
+      },
+      extend: {
+        title: {
+          show: true,
+          text: "流量统计",
+          left: "center",
+          top: 20,
+
+        },
+        legend: {
+          left: "center",
+          bottom: "15px",
+        },
+        label: {
+          show: true,
+          position: "top"
+        }
+      }
+    };
+  },
+  mounted() {
+    this.$nextTick(_ => {
+      setTimeout(()=>{
+        this.$refs.consoleNodeLoad.echarts.resize()
+      }, 100)
+    })
+  },
+  destroyed() {
+  },
+  methods: {
+    setData: function(data) {
+      this.chartData .rows = data;
+    }
+  }
+};
+</script>
@@ -6,7 +6,6 @@
 <script>
-
 import moment from "moment/moment";
 export default {
@@ -55,7 +54,7 @@ export default {
   },
   methods: {
     setData: function(data) {
-      this.chartData .rows = data;
+      this.chartData.rows = data;
     }
   }
@@ -10,6 +10,8 @@
       <el-menu-item index="/historicalRecord">历史记录</el-menu-item>
+      <el-menu-item index="/flowStatistics">流量统计</el-menu-item>
+
       <el-menu-item v-if="editUser" index="/userManager">用户管理</el-menu-item>
       <!--            <el-submenu index="/setting">-->
@@ -27,6 +27,7 @@ import web from &#39;../components/setting/Web.vue&#39;
 import wasmPlayer from '../components/common/jessibuca.vue'
 import rtcPlayer from '../components/dialog/rtcPlayer.vue'
 import historicalRecord from "../components/HistoricalRecord.vue";
+import flowStatistics from "../components/FlowStatistics.vue";
 const originalPush = VueRouter.prototype.push
 VueRouter.prototype.push = function push(location) {
@@ -66,6 +67,10 @@ export default new VueRouter({
           component: historicalRecord,
         },
         {
+          path: '/flowStatistics',
+          component: flowStatistics,
+        },
+        {
           path: '/minhang/deviceList',
           name: 'minhang',
           component: minhang,
 @font-face {
   font-family: "iconfont"; /* Project id 1291092 */
-  src: url('iconfont.woff2?t=1673251105600') format('woff2'),
+  src: url('../../../../wvp-jtt1078-pro/wvp-jtt1078-ui/src/assets/iconfont/iconfont.woff2?t=1673251105600') format('woff2'),
        url('iconfont.woff?t=1673251105600') format('woff'),
        url('iconfont.ttf?t=1673251105600') format('truetype');
 }
-window.baseUrl = "http://118.113.164.50:18989";
+const baseUrl = `${window.location.protocol}//${window.location.hostname}${window.location.port ? ':' + window.location.port : ''}`;
+
+window.baseUrl = baseUrl;
 // map组件全局参数, 注释此内容可以关闭地图功能
 window.mapParam = {