From b2aa5c839dbce7560af7a949818ec5598dde224d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 27 Jun 2024 17:51:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/service/IGbChannelService.java    |   5 +-
 .../RedisPushStreamStatusMsgListener.java     |   4 +-
 .../streamPush/bean/StreamPushExcelDto.java   |  10 +-
 .../bean/StreamPushInfoForUpdateLoad.java     |  16 --
 .../controller/StreamPushController.java      |  16 +-
 .../vmp/streamPush/dao/StreamPushMapper.java  |   7 +-
 .../enent/StreamPushUploadFileHandler.java    |  76 ++-----
 .../service/IStreamPushService.java           |  45 +----
 .../service/impl/StreamPushServiceImpl.java   | 191 +++---------------
 src/main/resources/application.yml            |   2 +-
 10 files changed, 65 insertions(+), 307 deletions(-)
 delete mode 100644 src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushInfoForUpdateLoad.java

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java
index 4858bc5a..4df6f48b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java
@@ -16,10 +16,13 @@ public interface IGbChannelService {
 
     int offline(CommonGBChannel commonGBChannel);
 
+    int offline(List<CommonGBChannel> commonGBChannelList);
+
     int online(CommonGBChannel commonGBChannel);
 
+    int online(List<CommonGBChannel> commonGBChannelList);
+
     void closeSend(CommonGBChannel commonGBChannel);
 
     void batchAdd(List<CommonGBChannel> commonGBChannels);
-
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
index c9bac16f..2d3aa8b0 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java
@@ -70,7 +70,7 @@ public class RedisPushStreamStatusMsgListener implements MessageListener, Applic
                         dynamicTask.stop(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED);
                         if (statusChangeFromPushStream.isSetAllOffline()) {
                             // 所有设备离线
-                            streamPushService.allStreamOffline();
+                            streamPushService.allOffline();
                         }
                         if (statusChangeFromPushStream.getOfflineStreams() != null
                                 && statusChangeFromPushStream.getOfflineStreams().size() > 0) {
@@ -99,7 +99,7 @@ public class RedisPushStreamStatusMsgListener implements MessageListener, Applic
             dynamicTask.startDelay(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED, ()->{
                 logger.info("[REDIS消息]未收到redis回复推流设备状态，执行推流设备离线");
                 // 五秒收不到请求就设置通道离线，然后通知上级离线
-                streamPushService.allStreamOffline();
+                streamPushService.allOffline();
             }, 5000);
         }
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java
index 2bd01bdb..bfaaade0 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushExcelDto.java
@@ -18,11 +18,11 @@ public class StreamPushExcelDto {
     @ExcelProperty("国标ID")
     private String gbId;
 
-    @ExcelProperty("平台ID")
-    private String platformId;
-
-    @ExcelProperty("目录ID")
-    private String catalogId;
+//    @ExcelProperty("平台ID")
+//    private String platformId;
+//
+//    @ExcelProperty("目录ID")
+//    private String catalogId;
 
     @ExcelProperty("在线状态")
     private boolean status;
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushInfoForUpdateLoad.java b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushInfoForUpdateLoad.java
deleted file mode 100644
index 79df81cf..00000000
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPushInfoForUpdateLoad.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.genersoft.iot.vmp.streamPush.bean;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用来关联推流数据关联的平台和目录
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class StreamPushInfoForUpdateLoad extends StreamPush{
-
-    private String platformId;
-
-    private String catalogId;
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/controller/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/streamPush/controller/StreamPushController.java
index a4205a91..71f61272 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/controller/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/controller/StreamPushController.java
@@ -100,18 +100,6 @@ public class StreamPushController {
         }
     }
 
-    @DeleteMapping(value = "/batchStop")
-    @ResponseBody
-    @Operation(summary = "中止多个推流", security = @SecurityRequirement(name = JwtUtils.HEADER))
-    public void batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
-        if (batchGBStreamParam.getGbStreams().size() == 0) {
-            throw new ControllerException(ErrorCode.ERROR100);
-        }
-        if (!streamPushService.batchStop(batchGBStreamParam.getGbStreams())){
-            throw new ControllerException(ErrorCode.ERROR100);
-        }
-    }
-
     @PostMapping(value = "upload")
     @ResponseBody
     public DeferredResult<ResponseEntity<WVPResult<Object>>> uploadChannelFile(@RequestParam(value = "file") MultipartFile file){
@@ -252,10 +240,8 @@ public class StreamPushController {
         if (ObjectUtils.isEmpty(stream.getApp()) && ObjectUtils.isEmpty(stream.getStream())) {
             throw new ControllerException(ErrorCode.ERROR400.getCode(), "app或stream不可为空");
         }
-        stream.setStatus(false);
+        stream.setGbStatus(false);
         stream.setPushIng(false);
-        stream.setAliveSecond(0L);
-        stream.setTotalReaderCount(0);
         if (!streamPushService.add(stream)) {
             throw new ControllerException(ErrorCode.ERROR100);
         }
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
index c88479c7..0a812069 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
@@ -144,7 +144,7 @@ public interface StreamPushMapper {
             "(#{item.app}, #{item.stream}) " +
             "</foreach>" +
             ")</script>")
-    List<GbStream> getOnlinePusherForGbInList(List<StreamPushItemFromRedis> offlineStreams);
+    List<StreamPush> getOnlinePusherForGbInList(List<StreamPushItemFromRedis> offlineStreams);
 
     @Update("<script> "+
             "UPDATE wvp_stream_push SET status=0  where (app, stream) in (" +
@@ -161,7 +161,7 @@ public interface StreamPushMapper {
             "(#{item.app}, #{item.stream}) " +
             "</foreach>" +
             ") </script>")
-    List<GbStream> getOfflinePusherForGbInList(List<StreamPushItemFromRedis> onlineStreams);
+    List<StreamPush> getOfflinePusherForGbInList(List<StreamPushItemFromRedis> onlineStreams);
 
     @Update("<script> "+
             "UPDATE wvp_stream_push SET status=1  where (app, stream) in (" +
@@ -172,7 +172,7 @@ public interface StreamPushMapper {
     void online(List<StreamPushItemFromRedis> onlineStreams);
 
     @Select("SELECT gs.* FROM wvp_stream_push sp left join wvp_gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream where sp.status = true")
-    List<GbStream> getOnlinePusherForGb();
+    List<StreamPush> getOnlinePusherForGb();
 
     @Update("UPDATE wvp_stream_push SET status=0")
     void setAllStreamOffline();
@@ -210,4 +210,5 @@ public interface StreamPushMapper {
             " left join wvp_gb_stream  wgs  on wgs.app = wsp.app and wgs.stream = wsp.stream")
     Map<String, StreamPush> getAllGBId();
 
+    StreamPush select(Integer streamPushId);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java b/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java
index ed597029..fda694ba 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/enent/StreamPushUploadFileHandler.java
@@ -2,8 +2,8 @@ package com.genersoft.iot.vmp.streamPush.enent;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import com.genersoft.iot.vmp.streamPush.bean.StreamPush;
 import com.genersoft.iot.vmp.streamPush.bean.StreamPushExcelDto;
-import com.genersoft.iot.vmp.streamPush.bean.StreamPushInfoForUpdateLoad;
 import com.genersoft.iot.vmp.streamPush.service.IStreamPushService;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.google.common.collect.BiMap;
@@ -17,37 +17,22 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
     /**
      * 错误数据的回调，用于将错误数据发送给页面
      */
-    private ErrorDataHandler errorDataHandler;
+    private final ErrorDataHandler errorDataHandler;
 
     /**
      * 推流的业务类用于存储数据
      */
-    private IStreamPushService pushService;
+    private final IStreamPushService pushService;
 
     /**
      * 默认流媒体节点ID
      */
-    private String defaultMediaServerId;
-
-    /**
-     * 用于存储不加过滤的所有数据
-     */
-    private final List<StreamPushInfoForUpdateLoad> streamPushItems = new ArrayList<>();
+    private final String defaultMediaServerId;
 
     /**
      * 用于存储更具APP+Stream过滤后的数据，可以直接存入stream_push表与gb_stream表
      */
-    private final Map<String, StreamPushInfoForUpdateLoad> streamPushItemForSave = new HashMap<>();
-
-    /**
-     * 用于存储按照APP+Stream为KEY， 平台ID+目录Id 为value的数据，用于存储到gb_stream表后获取app+Stream对应的平台与目录信息，然后存入关联表
-     */
-    private final Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
-
-    /**
-     * 用于判断文件是否存在重复的app+Stream+平台ID
-     */
-    private final Set<String> streamPushStreamSet = new HashSet<>();
+    private final Map<String, StreamPush> streamPushItemForSave = new HashMap<>();
 
     /**
      * 用于存储APP+Stream->国标ID 的数据结构, 数据一一对应，全局判断APP+Stream->国标ID是否存在不对应
@@ -115,49 +100,21 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
             }
         }
 
-        if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) {
-            errorStreamList.add("行：" + rowIndex + ", " +  streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+  " 平台信息重复");
-            return;
-        }else {
-            if (pushMapInDb.get(streamPushExcelDto.getApp()+streamPushExcelDto.getStream()) != null) {
-                errorStreamList.add("行：" + rowIndex + ", " +  streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+  " 数据已存在");
-                return;
-            }
-            streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId());
-        }
+        StreamPush streamPush = new StreamPush();
+        streamPush.setApp(streamPushExcelDto.getApp());
+        streamPush.setStream(streamPushExcelDto.getStream());
+        streamPush.setGbDeviceId(streamPushExcelDto.getGbId());
+        streamPush.setGbStatus(streamPushExcelDto.isStatus());
+        streamPush.setCreateTime(DateUtil.getNow());
+        streamPush.setMediaServerId(defaultMediaServerId);
+        streamPush.setGbName(streamPushExcelDto.getName());
 
-        StreamPushInfoForUpdateLoad streamPushInfoForUpdateLoad = new StreamPushInfoForUpdateLoad();
-        streamPushInfoForUpdateLoad.setApp(streamPushExcelDto.getApp());
-        streamPushInfoForUpdateLoad.setStream(streamPushExcelDto.getStream());
-        streamPushInfoForUpdateLoad.setGbDeviceId(streamPushExcelDto.getGbId());
-        streamPushInfoForUpdateLoad.setGbStatus(streamPushExcelDto.isStatus());
-        streamPushInfoForUpdateLoad.setCreateTime(DateUtil.getNow());
-        streamPushInfoForUpdateLoad.setMediaServerId(defaultMediaServerId);
-        streamPushInfoForUpdateLoad.setGbName(streamPushExcelDto.getName());
-        streamPushInfoForUpdateLoad.setPlatformId(streamPushExcelDto.getPlatformId());
-        streamPushInfoForUpdateLoad.setCatalogId(streamPushExcelDto.getCatalogId());
-
-        // 存入所有的通道信息
-        streamPushItems.add(streamPushInfoForUpdateLoad);
-        streamPushItemForSave.put(streamPushInfoForUpdateLoad.getApp() + streamPushInfoForUpdateLoad.getStream(), streamPushInfoForUpdateLoad);
-
-        if (!ObjectUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
-            List<String[]> platformList = streamPushItemsForPlatform.computeIfAbsent(streamPushInfoForUpdateLoad.getApp() + streamPushInfoForUpdateLoad.getStream(), k -> new ArrayList<>());
-            String platformId = streamPushExcelDto.getPlatformId();
-            String catalogId = streamPushExcelDto.getCatalogId();
-            if (ObjectUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
-                catalogId = null;
-            }
-            String[] platFormInfoArray = new String[]{platformId, catalogId};
-            platformList.add(platFormInfoArray);
-        }
+        streamPushItemForSave.put(streamPush.getApp() + streamPush.getStream(), streamPush);
 
         loadedSize ++;
         if (loadedSize > 1000) {
             saveData();
-            streamPushItems.clear();
             streamPushItemForSave.clear();
-            streamPushItemsForPlatform.clear();
             loadedSize = 0;
         }
 
@@ -167,18 +124,15 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
         // 这里也要保存数据，确保最后遗留的数据也存储到数据库
         saveData();
-        streamPushItems.clear();
         streamPushItemForSave.clear();
         gBMap.clear();
-        streamPushStreamSet.clear();
-        streamPushItemsForPlatform.clear();
         errorDataHandler.handle(errorStreamList, errorInfoList);
     }
 
     private void saveData(){
         if (!streamPushItemForSave.isEmpty()) {
             // 向数据库查询是否存在重复的app
-            pushService.batchAddForUpload(new ArrayList<>(streamPushItemForSave.values()), streamPushItemsForPlatform);
+            pushService.batchAdd(new ArrayList<>(streamPushItemForSave.values()));
         }
     }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java
index 196643fd..feaf0770 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java
@@ -1,13 +1,9 @@
 package com.genersoft.iot.vmp.streamPush.service;
 
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
 import com.genersoft.iot.vmp.streamPush.bean.StreamPush;
-import com.genersoft.iot.vmp.streamPush.bean.StreamPushInfoForUpdateLoad;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
 import com.github.pagehelper.PageInfo;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -17,20 +13,6 @@ import java.util.Map;
  */
 public interface IStreamPushService {
 
-    /**
-     * 将应用名和流ID加入国标关联
-     * @param stream
-     * @return
-     */
-    boolean saveToGB(GbStream stream);
-
-    /**
-     * 将应用名和流ID移出国标关联
-     * @param stream
-     * @return
-     */
-    boolean removeFromGB(GbStream stream);
-
     /**
      * 获取
      */
@@ -38,8 +20,6 @@ public interface IStreamPushService {
 
     List<StreamPush> getPushList(String mediaSererId);
 
-    StreamPush transform(OnStreamChangedHookParam item);
-
     StreamPush getPush(String app, String streamId);
 
     boolean stop(StreamPush streamPush);
@@ -61,36 +41,16 @@ public interface IStreamPushService {
      */
     void zlmServerOffline(String mediaServerId);
 
-    /**
-     * 清空
-     */
-    void clean();
-
-
-    boolean saveToRandomGB();
-
     /**
      * 批量添加
      */
     void batchAdd(List<StreamPush> streamPushExcelDtoList);
 
-    @Transactional
-    void batchAddForUpload(List<StreamPushInfoForUpdateLoad> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
-
-    /**
-     * 中止多个推流
-     */
-    boolean batchStop(List<GbStream> streamPushItems);
-
-    /**
-     * 导入时批量增加
-     */
-    void batchAddForUpload(List<StreamPushInfoForUpdateLoad> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
 
     /**
      * 全部离线
      */
-    void allStreamOffline();
+    void allOffline();
 
     /**
      * 推流离线
@@ -123,9 +83,6 @@ public interface IStreamPushService {
 
     Map<String, StreamPush> getAllAppAndStreamMap();
 
-
-    void updatePush(OnStreamChangedHookParam param);
-
     Map<String, StreamPush> getAllGBId();
 
     void updateStatus(StreamPush push);
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
index ce714241..57668be3 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
@@ -3,14 +3,8 @@ package com.genersoft.iot.vmp.streamPush.service.impl;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.gb28181.service.IGbChannelService;
 import com.genersoft.iot.vmp.media.bean.MediaInfo;
 import com.genersoft.iot.vmp.media.bean.MediaServer;
@@ -23,12 +17,7 @@ import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
 import com.genersoft.iot.vmp.media.zlm.dto.hook.OriginType;
 import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformCatalogMapper;
-import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
-import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
 import com.genersoft.iot.vmp.streamPush.bean.StreamPush;
-import com.genersoft.iot.vmp.streamPush.bean.StreamPushInfoForUpdateLoad;
 import com.genersoft.iot.vmp.streamPush.dao.StreamPushMapper;
 import com.genersoft.iot.vmp.streamPush.service.IStreamPushService;
 import com.genersoft.iot.vmp.utils.DateUtil;
@@ -56,21 +45,6 @@ public class StreamPushServiceImpl implements IStreamPushService {
     @Autowired
     private StreamPushMapper streamPushMapper;
 
-    @Autowired
-    private StreamProxyMapper streamProxyMapper;
-
-    @Autowired
-    private ParentPlatformMapper parentPlatformMapper;
-
-    @Autowired
-    private PlatformCatalogMapper platformCatalogMapper;
-
-    @Autowired
-    private PlatformGbStreamMapper platformGbStreamMapper;
-
-    @Autowired
-    private EventPublisher eventPublisher;
-
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
 
@@ -86,9 +60,6 @@ public class StreamPushServiceImpl implements IStreamPushService {
     @Autowired
     TransactionDefinition transactionDefinition;
 
-    @Autowired
-    private MediaConfig mediaConfig;
-
     @Autowired
     private IGbChannelService gbChannelService;
 
@@ -473,146 +444,39 @@ public class StreamPushServiceImpl implements IStreamPushService {
         gbChannelService.batchAdd(commonGBChannels);
     }
 
-
     @Override
-    @Transactional
-    public void batchAddForUpload(List<StreamPushInfoForUpdateLoad> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll ) {
-        // 存储数据到stream_push表
-        streamPushMapper.addAll(streamPushItems);
-
-        List<CommonGBChannel> channelList = new ArrayList<>();
-        for (StreamPush streamPushItem : streamPushItems) {
-            if (streamPushItem.getGbDeviceId() != null && streamPushItem.getId() > 0) {
-                channelList.add(streamPushItem.getCommonGBChannel());
-            }
-        }
-        // 存储数据到gb_stream表， id会返回到streamPushItemForGbStream里
-        if (!channelList.isEmpty()) {
-            gbChannelService.batchAdd(channelList);
-        }
-
-
-        if (!streamPushItemsForPlatform.isEmpty()) {
-            // 获取所有平台，平台和目录信息一般不会特别大量。
-            List<ParentPlatform> parentPlatformList = parentPlatformMapper.getParentPlatformList();
-            Map<String, Map<String, PlatformCatalog>> platformInfoMap = new HashMap<>();
-            if (parentPlatformList.isEmpty()) {
-                return;
-            }
-            for (ParentPlatform platform : parentPlatformList) {
-                Map<String, PlatformCatalog> catalogMap = new HashMap<>();
-
-                // 创建根节点
-                PlatformCatalog platformCatalog = new PlatformCatalog();
-                platformCatalog.setId(platform.getServerGBId());
-                catalogMap.put(platform.getServerGBId(), platformCatalog);
-
-                // 查询所有节点信息
-                List<PlatformCatalog> platformCatalogs = platformCatalogMapper.selectByPlatForm(platform.getServerGBId());
-                if (platformCatalogs.size() > 0) {
-                    for (PlatformCatalog catalog : platformCatalogs) {
-                        catalogMap.put(catalog.getId(), catalog);
-                    }
-                }
-                platformInfoMap.put(platform.getServerGBId(), catalogMap);
-            }
-            List<StreamPush> streamPushItemListFroPlatform = new ArrayList<>();
-            Map<String, List<GbStream>> platformForEvent = new HashMap<>();
-            // 遍历存储结果，查找app+Stream->platformId+catalogId的对应关系，然后执行批量写入
-            for (StreamPush streamPushItem : streamPushItemsForPlatform) {
-                List<String[]> platFormInfoList = streamPushItemsForAll.get(streamPushItem.getApp() + streamPushItem.getStream());
-                if (platFormInfoList != null && platFormInfoList.size() > 0) {
-                    for (String[] platFormInfoArray : platFormInfoList) {
-                        StreamPush streamPushItemForPlatform = new StreamPush();
-                        streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
-                        if (platFormInfoArray.length > 0) {
-                            // 数组 platFormInfoArray 0 为平台ID。 1为目录ID
-                            // 不存在这个平台，则忽略导入此关联关系
-                            if (platformInfoMap.get(platFormInfoArray[0]) == null
-                                    || platformInfoMap.get(platFormInfoArray[0]).get(platFormInfoArray[1]) == null) {
-                                log.info("导入数据时不存在平台或目录{}/{},已导入未分配", platFormInfoArray[0], platFormInfoArray[1] );
-                                continue;
-                            }
-                            streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
-                            List<GbStream> gbStreamList = platformForEvent.get(platFormInfoArray[0]);
-                            if (gbStreamList == null) {
-                                gbStreamList = new ArrayList<>();
-                                platformForEvent.put(platFormInfoArray[0], gbStreamList);
-                            }
-                            // 为发送通知整理数据
-                            streamPushItemForPlatform.setName(streamPushItem.getName());
-                            streamPushItemForPlatform.setApp(streamPushItem.getApp());
-                            streamPushItemForPlatform.setStream(streamPushItem.getStream());
-                            streamPushItemForPlatform.setGbId(streamPushItem.getGbId());
-                            gbStreamList.add(streamPushItemForPlatform);
-                        }
-                        if (platFormInfoArray.length > 1) {
-                            streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
-                        }
-                        streamPushItemListFroPlatform.add(streamPushItemForPlatform);
-                    }
-
-                }
-            }
-            if (!streamPushItemListFroPlatform.isEmpty()) {
-                platformGbStreamMapper.batchAdd(streamPushItemListFroPlatform);
-                // 发送通知
-                for (String platformId : platformForEvent.keySet()) {
-                    eventPublisher.catalogEventPublishForStream(
-                            platformId, platformForEvent.get(platformId), CatalogEvent.ADD);
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean batchStop(List<GbStream> gbStreams) {
-        if (gbStreams == null || gbStreams.size() == 0) {
-            return false;
-        }
-        gbStreamService.sendCatalogMsgs(gbStreams, CatalogEvent.DEL);
-
-        platformGbStreamMapper.delByGbStreams(gbStreams);
-        gbStreamMapper.batchDelForGbStream(gbStreams);
-        int delStream = streamPushMapper.delAllForGbStream(gbStreams);
-        if (delStream > 0) {
-            for (GbStream gbStream : gbStreams) {
-                MediaServer mediaServerItem = mediaServerService.getOne(gbStream.getMediaServerId());
-                mediaServerService.closeStreams(mediaServerItem, gbStream.getApp(), gbStream.getStream());
-            }
-
-        }
-        return true;
-    }
-
-    @Override
-    public void allStreamOffline() {
-        List<GbStream> onlinePushers = streamPushMapper.getOnlinePusherForGb();
-        if (onlinePushers.size() == 0) {
+    public void allOffline() {
+        List<StreamPush> onlinePushers = streamPushMapper.getOnlinePusherForGb();
+        if (onlinePushers.isEmpty()) {
             return;
         }
-        streamPushMapper.setAllStreamOffline();
-
-        // 发送通知
-        eventPublisher.catalogEventPublishForStream(null, onlinePushers, CatalogEvent.OFF);
+        List<CommonGBChannel> commonGBChannelList = new ArrayList<>();
+        for (StreamPush onlinePusher : onlinePushers) {
+            commonGBChannelList.add(onlinePusher.getCommonGBChannel());
+        }
+        gbChannelService.offline(commonGBChannelList);
     }
 
     @Override
     public void offline(List<StreamPushItemFromRedis> offlineStreams) {
         // 更新部分设备离线
-        List<GbStream> onlinePushers = streamPushMapper.getOnlinePusherForGbInList(offlineStreams);
-        streamPushMapper.offline(offlineStreams);
-        // 发送通知
-        eventPublisher.catalogEventPublishForStream(null, onlinePushers, CatalogEvent.OFF);
+        List<StreamPush> onlinePushers = streamPushMapper.getOnlinePusherForGbInList(offlineStreams);
+        List<CommonGBChannel> commonGBChannelList = new ArrayList<>();
+        for (StreamPush onlinePusher : onlinePushers) {
+            commonGBChannelList.add(onlinePusher.getCommonGBChannel());
+        }
+        gbChannelService.offline(commonGBChannelList);
     }
 
     @Override
     public void online(List<StreamPushItemFromRedis> onlineStreams) {
         // 更新部分设备上线streamPushService
-        List<GbStream> onlinePushers = streamPushMapper.getOfflinePusherForGbInList(onlineStreams);
-        streamPushMapper.online(onlineStreams);
-        // 发送通知
-        eventPublisher.catalogEventPublishForStream(null, onlinePushers, CatalogEvent.ON);
+        List<StreamPush> offlinePushers = streamPushMapper.getOfflinePusherForGbInList(onlineStreams);
+        List<CommonGBChannel> commonGBChannelList = new ArrayList<>();
+        for (StreamPush onlinePusher : offlinePushers) {
+            commonGBChannelList.add(onlinePusher.getCommonGBChannel());
+        }
+        gbChannelService.online(commonGBChannelList);
     }
 
     @Override
@@ -641,18 +505,27 @@ public class StreamPushServiceImpl implements IStreamPushService {
 
     @Override
     public void updateStatus(StreamPush push) {
-
+        if (push.getGbDeviceId() != null) {
+            return;
+        }
+        if (push.getGbStatus()) {
+            gbChannelService.online(push.getCommonGBChannel());
+        }else {
+            gbChannelService.offline(push.getCommonGBChannel());
+        }
     }
 
 
 
     @Override
     public void updatePushStatus(Integer streamPushId, boolean pushIng) {
-        streamPushInDb.setPushIng(true);
+        StreamPush streamPushInDb = streamPushMapper.select(streamPushId);
+        streamPushInDb.setPushIng(pushIng);
         if (userSetting.isUsePushingAsStatus()) {
-            streamPushInDb.setGbStatus(true);
+            streamPushInDb.setGbStatus(pushIng);
         }
         streamPushInDb.setPushTime(DateUtil.getNow());
+        updateStatus(streamPushInDb);
     }
 
     private List<StreamPush> handleJSON(List<StreamInfo> streamInfoList) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ddb05dee..023c055c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: local271
\ No newline at end of file
+    active: local272
\ No newline at end of file