From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs，解决较高版本node打包时的警告
---
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
index 43be957..2cbb426 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -15,10 +16,10 @@
@Insert("INSERT INTO parent_platform (enable, name, serverGBId, serverGBDomain, serverIP, serverPort, deviceGBId, deviceIp, " +
" devicePort, username, password, expires, keepTimeout, transport, characterSet, ptz, rtcp, " +
- " status) " +
+ " status, shareAllLiveStream, startOfflinePush, catalogId, administrativeDivision, catalogGroup) " +
" VALUES (${enable}, '${name}', '${serverGBId}', '${serverGBDomain}', '${serverIP}', ${serverPort}, '${deviceGBId}', '${deviceIp}', " +
" '${devicePort}', '${username}', '${password}', '${expires}', '${keepTimeout}', '${transport}', '${characterSet}', ${ptz}, ${rtcp}, " +
- " ${status})")
+ " ${status}, ${shareAllLiveStream}, ${startOfflinePush}, #{catalogId}, #{administrativeDivision}, #{catalogGroup})")
int addParentPlatform(ParentPlatform parentPlatform);
@Update("UPDATE parent_platform " +
@@ -39,14 +40,30 @@
"characterSet=#{characterSet}, " +
"ptz=#{ptz}, " +
"rtcp=#{rtcp}, " +
- "status=#{status} " +
+ "status=#{status}, " +
+ "shareAllLiveStream=#{shareAllLiveStream}, " +
+ "startOfflinePush=${startOfflinePush}, " +
+ "catalogGroup=#{catalogGroup}, " +
+ "administrativeDivision=#{administrativeDivision}, " +
+ "catalogId=#{catalogId} " +
"WHERE id=#{id}")
int updateParentPlatform(ParentPlatform parentPlatform);
@Delete("DELETE FROM parent_platform WHERE serverGBId=#{serverGBId}")
int delParentPlatform(ParentPlatform parentPlatform);
- @Select("SELECT *,( SELECT count(0) FROM platform_gb_channel pc WHERE pc.platformId = pp.serverGBId) as channelCount FROM parent_platform pp ")
+ @Select("SELECT *, ((SELECT count(0)\n" +
+ " FROM platform_gb_channel pc\n" +
+ " WHERE pc.platformId = pp.serverGBId)\n" +
+ " +\n" +
+ " (SELECT count(0)\n" +
+ " FROM platform_gb_stream pgs\n" +
+ " WHERE pgs.platformId = pp.serverGBId)\n" +
+ " +\n" +
+ " (SELECT count(0)\n" +
+ " FROM platform_catalog pgc\n" +
+ " WHERE pgc.platformId = pp.serverGBId)) as channelCount\n" +
+ "FROM parent_platform pp ")
List<ParentPlatform> getParentPlatformList();
@Select("SELECT * FROM parent_platform WHERE enable=#{enable}")
@@ -59,5 +76,23 @@
ParentPlatform getParentPlatById(int id);
@Update("UPDATE parent_platform SET status=false" )
- void outlineForAllParentPlatform();
+ int outlineForAllParentPlatform();
+
+ @Update("UPDATE parent_platform SET status=#{online} WHERE serverGBId=#{platformGbID}" )
+ int updateParentPlatformStatus(String platformGbID, boolean online);
+
+ @Select("SELECT * FROM parent_platform WHERE shareAllLiveStream=true")
+ List<ParentPlatform> selectAllAhareAllLiveStream();
+
+ @Update(value = {" <script>" +
+ "UPDATE parent_platform " +
+ "SET catalogId=#{catalogId}" +
+ "WHERE serverGBId=#{platformId}"+
+ "</script>"})
+ int setDefaultCatalog(String platformId, String catalogId);
+
+ @Select("select 'channel' as name, count(pgc.platformId) count from platform_gb_channel pgc left join device_channel dc on dc.id = pgc.deviceChannelId where pgc.platformId=#{platformId} and dc.channelId =#{gbId} " +
+ "union " +
+ "select 'stream' as name, count(pgs.platformId) count from platform_gb_stream pgs left join gb_stream gs on pgs.gbStreamId = gs.gbStreamId where pgs.platformId=#{platformId} and gs.gbId = #{gbId}")
+ List<ChannelSourceInfo> getChannelSource(String platformId, String gbId);
}
--
Gitblit v1.8.0