From 07b182da98ac54fffa8f36b8db27d6212e1e0bf7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 十二月 2023 15:38:40 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into feature/record
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 14
src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java | 2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java | 6
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java | 4
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 30 +-
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java | 6
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java | 10
pom.xml | 15
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java | 5
src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java | 8
src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java | 9
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java | 10
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java | 6
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 18
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java | 8
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 16
src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java | 8
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 16
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 22
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 6
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 34 +-
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java | 8
web_src/src/components/channelList.vue | 343 ++++++++++++++++++-------
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 16
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 10
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 15
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java | 12
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 94 ++++++
28 files changed, 506 insertions(+), 245 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b3e945..5f077f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,21 +163,16 @@
</dependency>
<!--鍦ㄧ嚎鏂囨。 -->
+ <!--鍦ㄧ嚎鏂囨。 -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.6.10</version>
</dependency>
<dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>2.2</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-security</artifactId>
+ <version>1.6.10</version>
</dependency>
<dependency>
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
index 587518f..0a472f8 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
@@ -1,9 +1,12 @@
package com.genersoft.iot.vmp.conf;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
+import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Contact;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.security.SecurityScheme;
import org.springframework.core.annotation.Order;
import org.springdoc.core.GroupedOpenApi;
import org.springframework.beans.factory.annotation.Value;
@@ -26,10 +29,14 @@
contact.setName("pan");
contact.setEmail("648540858@qq.com");
return new OpenAPI()
+ .components(new Components()
+ .addSecuritySchemes(JwtUtils.HEADER, new SecurityScheme()
+ .type(SecurityScheme.Type.HTTP)
+ .bearerFormat("JWT")))
.info(new Info().title("WVP-PRO 鎺ュ彛鏂囨。")
.contact(contact)
.description("寮�绠卞嵆鐢ㄧ殑28181鍗忚瑙嗛骞冲彴")
- .version("v2.0")
+ .version("v3.1.0")
.license(new License().name("Apache 2.0").url("http://springdoc.org")));
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java b/src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
index 3df7593..fcd1946 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
@@ -28,7 +28,7 @@
private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class);
- private static final String HEADER = "access-token";
+ public static final String HEADER = "access-token";
private static final String AUDIENCE = "Audience";
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
index 2f4686a..afc8105 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
@@ -68,6 +68,8 @@
matchers.add("/");
matchers.add("/#/**");
matchers.add("/static/**");
+ matchers.add("/swagger-ui.html");
+ matchers.add("/swagger-ui/");
matchers.add("/index.html");
matchers.add("/doc.html");
matchers.add("/webjars/**");
@@ -77,6 +79,7 @@
matchers.add("/api/device/query/snap/**");
matchers.add("/record_proxy/*/**");
matchers.add("/api/emit");
+ matchers.add("/favicon.ico");
// 鍙互鐩存帴璁块棶鐨勯潤鎬佹暟鎹�
web.ignoring().antMatchers(matchers.toArray(new String[0]));
}
@@ -113,7 +116,7 @@
.authorizeRequests()
.requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
.antMatchers(userSetting.getInterfaceAuthenticationExcludes().toArray(new String[0])).permitAll()
- .antMatchers("/api/user/login","/index/hook/**","/zlm_Proxy/FhTuMYqB2HeCuNOb/record/t/1/2023-03-25/16:35:07-16:35:16-9353.mp4").permitAll()
+ .antMatchers("/api/user/login", "/index/hook/**", "/swagger-ui/**", "/doc.html").permitAll()
.anyRequest().authenticated()
// 寮傚父澶勭悊鍣�
.and()
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index e614b9f..14640d8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.utils.DateUtil;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.dom4j.Attribute;
import org.dom4j.Document;
@@ -214,8 +215,11 @@
return deviceChannel;
}
Element nameElement = itemDevice.element("Name");
- if (nameElement != null) {
+ // 褰撻�氶亾鍚嶇О涓虹┖鏃讹紝璁剧疆閫氶亾鍚嶇О涓洪�氶亾缂栫爜锛岄伩鍏嶇骇鑱旀椂鍥犻�氶亾鍚嶇О涓虹┖瀵艰嚧涓婄骇鎺ユ敹閫氶亾澶辫触
+ if (nameElement != null && StringUtils.isNotBlank(nameElement.getText())) {
deviceChannel.setName(nameElement.getText());
+ } else {
+ deviceChannel.setName(channelId);
}
if(channelId.length() <= 8) {
deviceChannel.setHasAudio(false);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 1ff0d29..608bc27 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -6,7 +6,6 @@
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -31,7 +30,7 @@
@Update(value = {" <script>" +
"UPDATE wvp_device_channel " +
"SET update_time=#{updateTime}" +
- "<if test='name != null'>, name=#{name}</if>" +
+ ", custom_name=#{name}" +
"<if test='manufacture != null'>, manufacture=#{manufacture}</if>" +
"<if test='model != null'>, model=#{model}</if>" +
"<if test='owner != null'>, owner=#{owner}</if>" +
@@ -49,12 +48,12 @@
"<if test='ipAddress != null'>, ip_address=#{ipAddress}</if>" +
"<if test='port != null'>, port=#{port}</if>" +
"<if test='password != null'>, password=#{password}</if>" +
- "<if test='PTZType != null'>, ptz_type=#{PTZType}</if>" +
+ "<if test='PTZType != null'>, custom_ptz_type=#{PTZType}</if>" +
"<if test='status != null'>, status=#{status}</if>" +
"<if test='streamId != null'>, stream_id=#{streamId}</if>" +
"<if test='hasAudio != null'>, has_audio=#{hasAudio}</if>" +
- "<if test='longitude != null'>, longitude=#{longitude}</if>" +
- "<if test='latitude != null'>, latitude=#{latitude}</if>" +
+ ", custom_longitude=#{longitude}" +
+ ", custom_latitude=#{latitude}" +
"<if test='longitudeGcj02 != null'>, longitude_gcj02=#{longitudeGcj02}</if>" +
"<if test='latitudeGcj02 != null'>, latitude_gcj02=#{latitudeGcj02}</if>" +
"<if test='longitudeWgs84 != null'>, longitude_wgs84=#{longitudeWgs84}</if>" +
@@ -67,7 +66,43 @@
@Select(value = {" <script>" +
"SELECT " +
- "dc.* " +
+ "dc.id, " +
+ "dc.channel_id, " +
+ "COALESCE(dc.custom_name, dc.name) AS name, " +
+ "dc.manufacture, " +
+ "dc.model, " +
+ "dc.owner, " +
+ "dc.civil_code, " +
+ "dc.block, " +
+ "dc.address, " +
+ "dc.parent_id, " +
+ "dc.safety_way, " +
+ "dc.register_way, " +
+ "dc.cert_num, " +
+ "dc.certifiable, " +
+ "dc.err_code, " +
+ "dc.end_time, " +
+ "dc.secrecy, " +
+ "dc.ip_address, " +
+ "dc.port, " +
+ "dc.password, " +
+ "COALESCE(dc.custom_ptz_type, dc.ptz_type) AS ptz_type, " +
+ "dc.status, " +
+ "COALESCE(dc.custom_longitude, dc.longitude) AS longitude, " +
+ "COALESCE(dc.custom_latitude, dc.latitude) AS latitude, " +
+ "dc.stream_id, " +
+ "dc.device_id, " +
+ "dc.parental, " +
+ "dc.has_audio, " +
+ "dc.create_time, " +
+ "dc.update_time, " +
+ "dc.sub_count, " +
+ "dc.longitude_gcj02, " +
+ "dc.latitude_gcj02, " +
+ "dc.longitude_wgs84, " +
+ "dc.latitude_wgs84, " +
+ "dc.business_group_id, " +
+ "dc.gps_time " +
"from " +
"wvp_device_channel dc " +
"WHERE " +
@@ -154,7 +189,7 @@
" dc.id,\n" +
" dc.channel_id,\n" +
" dc.device_id,\n" +
- " dc.name,\n" +
+ " COALESCE(dc.custom_name, dc.name) AS name,\n" +
" de.manufacturer,\n" +
" de.host_address,\n" +
" dc.sub_count,\n" +
@@ -392,10 +427,10 @@
@Select("select * from wvp_device_channel where device_id=#{deviceId} and SUBSTRING(channel_id, 11, 3)=#{typeCode}")
List<DeviceChannel> getBusinessGroups(@Param("deviceId") String deviceId, @Param("typeCode") String typeCode);
- @Select("select dc.id, dc.channel_id, dc.device_id, dc.name, dc.manufacture,dc.model,dc.owner, pc.civil_code,dc.block, " +
+ @Select("select dc.id, dc.channel_id, dc.device_id, COALESCE(dc.custom_name, dc.name) AS name, dc.manufacture,dc.model,dc.owner, pc.civil_code,dc.block, " +
" dc.address, '0' as parental,'0' as channel_type, pc.id as parent_id, dc.safety_way, dc.register_way,dc.cert_num, dc.certifiable, " +
- " dc.err_code,dc.end_time, dc.secrecy, dc.ip_address, dc.port, dc.ptz_type, dc.password, dc.status, " +
- " dc.longitude_wgs84 as longitude, dc.latitude_wgs84 as latitude, pc.business_group_id " +
+ " dc.err_code,dc.end_time, dc.secrecy, dc.ip_address, dc.port, COALESCE(dc.custom_ptz_type, dc.ptz_type) AS ptz_type, dc.password, dc.status, " +
+ " COALESCE(dc.custom_longitude, dc.longitude) AS longitude, COALESCE(dc.custom_latitude, dc.latitude) AS latitude, pc.business_group_id " +
" from wvp_device_channel dc" +
" LEFT JOIN wvp_platform_gb_channel pgc on dc.id = pgc.device_channel_id" +
" LEFT JOIN wvp_platform_catalog pc on pgc.catalog_id = pc.id and pgc.platform_id = pc.platform_id" +
@@ -457,7 +492,44 @@
void clearPlay(String deviceId);
// 璁惧涓诲瓙鐮佹祦閫昏緫END
@Select(value = {" <script>" +
- "select * " +
+ "SELECT id,\n" +
+ " channel_id,\n" +
+ " COALESCE(custom_name, name) AS name,\n" +
+ " custom_name,\n" +
+ " manufacture,\n" +
+ " model,\n" +
+ " owner,\n" +
+ " civil_code,\n" +
+ " block,\n" +
+ " address,\n" +
+ " parent_id,\n" +
+ " safety_way,\n" +
+ " register_way,\n" +
+ " cert_num,\n" +
+ " certifiable,\n" +
+ " err_code,\n" +
+ " end_time,\n" +
+ " secrecy,\n" +
+ " ip_address,\n" +
+ " port,\n" +
+ " password,\n" +
+ " COALESCE(custom_ptz_type, ptz_type) AS ptz_type,\n" +
+ " status,\n" +
+ " COALESCE(custom_longitude, longitude) AS longitude,\n" +
+ " COALESCE(custom_latitude, latitude) AS latitude,\n" +
+ " stream_id,\n" +
+ " device_id,\n" +
+ " parental,\n" +
+ " has_audio,\n" +
+ " create_time,\n" +
+ " update_time,\n" +
+ " sub_count,\n" +
+ " longitude_gcj02,\n" +
+ " latitude_gcj02,\n" +
+ " longitude_wgs84,\n" +
+ " latitude_wgs84,\n" +
+ " business_group_id,\n" +
+ " gps_time\n" +
"from wvp_device_channel " +
"where device_id=#{deviceId}" +
" <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
index dd7de2b..b6ae971 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -15,6 +16,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
@@ -46,7 +48,7 @@
@ResponseBody
@GetMapping("/date/list")
- @Operation(summary = "鏌ヨ瀛樺湪浜戠褰曞儚鐨勬棩鏈�")
+ @Operation(summary = "鏌ヨ瀛樺湪浜戠褰曞儚鐨勬棩鏈�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴両D", required = true)
@Parameter(name = "year", description = "骞达紝缃┖鍒欐煡璇㈠綋骞�", required = false)
@@ -89,7 +91,7 @@
@ResponseBody
@GetMapping("/list")
- @Operation(summary = "鍒嗛〉鏌ヨ浜戠褰曞儚")
+ @Operation(summary = "鍒嗛〉鏌ヨ浜戠褰曞儚"security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "query", description = "妫�绱㈠唴瀹�", required = false)
@Parameter(name = "app", description = "搴旂敤鍚�", required = false)
@Parameter(name = "stream", description = "娴両D", required = false)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java
index 684708c..91c992f 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/MobilePosition/MobilePositionController.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.vmanager.gb28181.MobilePosition;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
@@ -13,6 +14,7 @@
import com.github.pagehelper.util.StringUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +61,7 @@
* @param end 缁撴潫鏃堕棿
* @return
*/
- @Operation(summary = "鏌ヨ鍘嗗彶杞ㄨ抗")
+ @Operation(summary = "鏌ヨ鍘嗗彶杞ㄨ抗", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿")
@Parameter(name = "start", description = "寮�濮嬫椂闂�")
@@ -84,7 +86,7 @@
* @param deviceId 璁惧ID
* @return
*/
- @Operation(summary = "鏌ヨ璁惧鏈�鏂颁綅缃�")
+ @Operation(summary = "鏌ヨ璁惧鏈�鏂颁綅缃�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/latest/{deviceId}")
public MobilePosition latestPosition(@PathVariable String deviceId) {
@@ -96,7 +98,7 @@
* @param deviceId 璁惧ID
* @return
*/
- @Operation(summary = "鑾峰彇绉诲姩浣嶇疆淇℃伅")
+ @Operation(summary = "鑾峰彇绉诲姩浣嶇疆淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/realtime/{deviceId}")
public DeferredResult<MobilePosition> realTimePosition(@PathVariable String deviceId) {
@@ -136,7 +138,7 @@
* @param interval 涓婃姤鏃堕棿闂撮殧
* @return true = 鍛戒护鍙戦�佹垚鍔�
*/
- @Operation(summary = "璁㈤槄浣嶇疆淇℃伅")
+ @Operation(summary = "璁㈤槄浣嶇疆淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "expires", description = "璁㈤槄瓒呮椂鏃堕棿", required = true)
@Parameter(name = "interval", description = "涓婃姤鏃堕棿闂撮殧", required = true)
@@ -162,7 +164,7 @@
* @param deviceId 璁惧ID
* @return true = 鍛戒护鍙戦�佹垚鍔�
*/
- @Operation(summary = "鏁版嵁浣嶇疆淇℃伅鏍煎紡澶勭悊")
+ @Operation(summary = "鏁版嵁浣嶇疆淇℃伅鏍煎紡澶勭悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/transform/{deviceId}")
public void positionTransform(@PathVariable String deviceId) {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
index 6f2a585..10c99a5 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.vmanager.gb28181.alarm;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
@@ -13,6 +14,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +58,7 @@
* @return
*/
@DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鎶ヨ")
+ @Operation(summary = "鍒犻櫎鎶ヨ", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "ID")
@Parameter(name = "deviceIds", description = "澶氫釜璁惧id,閫楀彿鍒嗛殧")
@Parameter(name = "time", description = "缁撴潫鏃堕棿")
@@ -93,7 +95,7 @@
* @return
*/
@GetMapping("/test/notify/alarm")
- @Operation(summary = "娴嬭瘯鍚戜笂绾�/璁惧鍙戦�佹ā鎷熸姤璀﹂�氱煡")
+ @Operation(summary = "娴嬭瘯鍚戜笂绾�/璁惧鍙戦�佹ā鎷熸姤璀﹂�氱煡", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿")
public void delete(@RequestParam String deviceId) {
Device device = storage.queryVideoDevice(deviceId);
@@ -141,7 +143,7 @@
* @param endTime 缁撴潫鏃堕棿
* @return
*/
- @Operation(summary = "鍒嗛〉鏌ヨ鎶ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎶ヨ", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page",description = "褰撳墠椤�",required = true)
@Parameter(name = "count",description = "姣忛〉鏌ヨ鏁伴噺",required = true)
@Parameter(name = "deviceId",description = "璁惧id")
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
index 544e345..2f32361 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
@@ -9,6 +9,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -17,6 +18,7 @@
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +59,7 @@
* @return
*/
@GetMapping("/basicParam/{deviceId}")
- @Operation(summary = "鍩烘湰閰嶇疆璁剧疆鍛戒护")
+ @Operation(summary = "鍩烘湰閰嶇疆璁剧疆鍛戒护", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "name", description = "鍚嶇О")
@@ -113,7 +115,7 @@
* @param channelId 閫氶亾ID
* @return
*/
- @Operation(summary = "璁惧閰嶇疆鏌ヨ璇锋眰")
+ @Operation(summary = "璁惧閰嶇疆鏌ヨ璇锋眰", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "configType", description = "閰嶇疆绫诲瀷")
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index bf0acb5..85f516a 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -9,6 +9,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -17,6 +18,7 @@
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +55,7 @@
*
* @param deviceId 璁惧ID
*/
- @Operation(summary = "杩滅▼鍚姩鎺у埗鍛戒护")
+ @Operation(summary = "杩滅▼鍚姩鎺у埗鍛戒护", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/teleboot/{deviceId}")
public void teleBootApi(@PathVariable String deviceId) {
@@ -76,7 +78,7 @@
* @param recordCmdStr Record锛氭墜鍔ㄥ綍鍍忥紝StopRecord锛氬仠姝㈡墜鍔ㄥ綍鍍�
* @param channelId 閫氶亾缂栫爜锛堝彲閫夛級
*/
- @Operation(summary = "褰曞儚鎺у埗")
+ @Operation(summary = "褰曞儚鎺у埗", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "recordCmdStr", description = "鍛戒护锛� 鍙�夊�硷細Record锛堟墜鍔ㄥ綍鍍忥級锛孲topRecord锛堝仠姝㈡墜鍔ㄥ綍鍍忥級", required = true)
@@ -125,7 +127,7 @@
* @param deviceId 璁惧ID
* @param guardCmdStr SetGuard锛氬竷闃诧紝ResetGuard锛氭挙闃�
*/
- @Operation(summary = "甯冮槻/鎾ら槻鍛戒护")
+ @Operation(summary = "甯冮槻/鎾ら槻鍛戒护", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "guardCmdStr", description = "鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true)
@GetMapping("/guard/{deviceId}/{guardCmdStr}")
@@ -170,7 +172,7 @@
* @param alarmMethod 鎶ヨ鏂瑰紡锛堝彲閫夛級
* @param alarmType 鎶ヨ绫诲瀷锛堝彲閫夛級
*/
- @Operation(summary = "鎶ヨ澶嶄綅")
+ @Operation(summary = "鎶ヨ澶嶄綅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "alarmMethod", description = "鎶ヨ鏂瑰紡")
@@ -217,7 +219,7 @@
* @param deviceId 璁惧ID
* @param channelId 閫氶亾ID
*/
- @Operation(summary = "寮哄埗鍏抽敭甯�")
+ @Operation(summary = "寮哄埗鍏抽敭甯�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿")
@GetMapping("/i_frame/{deviceId}")
@@ -249,7 +251,7 @@
* @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紙鍙�夛級
* @param channelId 閫氶亾缂栫爜锛堝彲閫夛級
*/
- @Operation(summary = "鐪嬪畧浣嶆帶鍒�")
+ @Operation(summary = "鐪嬪畧浣嶆帶鍒�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "enabled", description = "鏄惁寮�鍚湅瀹堜綅 1:寮�鍚�,0:鍏抽棴", required = true)
@@ -309,7 +311,7 @@
* @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
* @return
*/
- @Operation(summary = "鎷夋鏀惧ぇ")
+ @Operation(summary = "鎷夋鏀惧ぇ", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "length", description = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true)
@@ -359,7 +361,7 @@
* @param lengthy 鎷夋瀹藉害鍍忕礌鍊�
* @return
*/
- @Operation(summary = "鎷夋鏀惧ぇ")
+ @Operation(summary = "鎷夋缂╁皬", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿")
@Parameter(name = "length", description = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index 1986b65..f0af27f 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
@@ -23,6 +24,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.ibatis.annotations.Options;
@@ -85,7 +87,7 @@
* @param deviceId 鍥芥爣ID
* @return 鍥芥爣璁惧
*/
- @Operation(summary = "鏌ヨ鍥芥爣璁惧")
+ @Operation(summary = "鏌ヨ鍥芥爣璁惧", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/devices/{deviceId}")
public Device devices(@PathVariable String deviceId){
@@ -99,7 +101,7 @@
* @param count 姣忛〉鏌ヨ鏁伴噺
* @return 鍒嗛〉鍥芥爣鍒楄〃
*/
- @Operation(summary = "鍒嗛〉鏌ヨ鍥芥爣璁惧")
+ @Operation(summary = "鍒嗛〉鏌ヨ鍥芥爣璁惧", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@GetMapping("/devices")
@@ -123,7 +125,7 @@
* @return 閫氶亾鍒楄〃
*/
@GetMapping("/devices/{deviceId}/channels")
- @Operation(summary = "鍒嗛〉鏌ヨ閫氶亾")
+ @Operation(summary = "鍒嗛〉鏌ヨ閫氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@@ -149,7 +151,7 @@
* @param deviceId 璁惧id
* @return
*/
- @Operation(summary = "鍚屾璁惧閫氶亾")
+ @Operation(summary = "鍚屾璁惧閫氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/devices/{deviceId}/sync")
public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
@@ -177,7 +179,7 @@
* @param deviceId 璁惧id
* @return
*/
- @Operation(summary = "绉婚櫎璁惧")
+ @Operation(summary = "绉婚櫎璁惧", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@DeleteMapping("/devices/{deviceId}/delete")
public String delete(@PathVariable String deviceId){
@@ -222,7 +224,7 @@
* @param channelType 閫氶亾绫诲瀷
* @return 瀛愰�氶亾鍒楄〃
*/
- @Operation(summary = "鍒嗛〉鏌ヨ瀛愮洰褰曢�氶亾")
+ @Operation(summary = "鍒嗛〉鏌ヨ瀛愮洰褰曢�氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@@ -254,7 +256,7 @@
* @param channel 閫氶亾
* @return
*/
- @Operation(summary = "鏇存柊閫氶亾淇℃伅")
+ @Operation(summary = "鏇存柊閫氶亾淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channel", description = "閫氶亾淇℃伅", required = true)
@PostMapping("/channel/update/{deviceId}")
@@ -268,7 +270,7 @@
* @param streamMode 鏁版嵁娴佷紶杈撴ā寮�
* @return
*/
- @Operation(summary = "淇敼鏁版嵁娴佷紶杈撴ā寮�")
+ @Operation(summary = "淇敼鏁版嵁娴佷紶杈撴ā寮�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "streamMode", description = "鏁版嵁娴佷紶杈撴ā寮�, 鍙栧�硷細" +
"UDP锛坲dp浼犺緭锛夛紝TCP-ACTIVE锛坱cp涓诲姩妯″紡,鏆備笉鏀寔锛夛紝TCP-PASSIVE锛坱cp琚姩妯″紡锛�", required = true)
@@ -284,7 +286,7 @@
* @param device 璁惧淇℃伅
* @return
*/
- @Operation(summary = "娣诲姞璁惧淇℃伅")
+ @Operation(summary = "娣诲姞璁惧淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "device", description = "璁惧", required = true)
@PostMapping("/device/add/")
public void addDevice(Device device){
@@ -306,7 +308,7 @@
* @param device 璁惧淇℃伅
* @return
*/
- @Operation(summary = "鏇存柊璁惧淇℃伅")
+ @Operation(summary = "鏇存柊璁惧淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "device", description = "璁惧", required = true)
@PostMapping("/device/update/")
public void updateDevice(Device device){
@@ -321,7 +323,7 @@
*
* @param deviceId 璁惧id
*/
- @Operation(summary = "璁惧鐘舵�佹煡璇�")
+ @Operation(summary = "璁惧鐘舵�佹煡璇�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/devices/{deviceId}/status")
public DeferredResult<ResponseEntity<String>> deviceStatusApi(@PathVariable String deviceId) {
@@ -372,7 +374,7 @@
* @param endTime 鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
* @return true = 鍛戒护鍙戦�佹垚鍔�
*/
- @Operation(summary = "璁惧鐘舵�佹煡璇�")
+ @Operation(summary = "璁惧鎶ヨ鏌ヨ", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "startPriority", description = "鎶ヨ璧峰绾у埆")
@Parameter(name = "endPriority", description = "鎶ヨ缁堟绾у埆")
@@ -422,7 +424,7 @@
@GetMapping("/{deviceId}/sync_status")
- @Operation(summary = "鑾峰彇閫氶亾鍚屾杩涘害")
+ @Operation(summary = "鑾峰彇閫氶亾鍚屾杩涘害", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
public WVPResult<SyncStatus> getSyncStatus(@PathVariable String deviceId) {
SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
@@ -442,7 +444,7 @@
}
@GetMapping("/{deviceId}/subscribe_info")
- @Operation(summary = "鑾峰彇璁惧鐨勮闃呯姸鎬�")
+ @Operation(summary = "鑾峰彇璁惧鐨勮闃呯姸鎬�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
public WVPResult<Map<String, Integer>> getSubscribeInfo(@PathVariable String deviceId) {
Set<String> allKeys = dynamicTask.getAllKeys();
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
index 3bdee76..40fd832 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.vmanager.gb28181.gbStream;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.service.IGbStreamService;
@@ -11,6 +12,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +45,7 @@
* @param platformId 骞冲彴ID
* @return
*/
- @Operation(summary = "鏌ヨ鍥芥爣閫氶亾")
+ @Operation(summary = "鏌ヨ鍥芥爣閫氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
@Parameter(name = "platformId", description = "骞冲彴ID", required = true)
@@ -79,7 +81,7 @@
* @param gbStreamParam
* @return
*/
- @Operation(summary = "绉婚櫎鍥芥爣鍏宠仈")
+ @Operation(summary = "绉婚櫎鍥芥爣鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@DeleteMapping(value = "/del")
@ResponseBody
public void del(@RequestBody GbStreamParam gbStreamParam){
@@ -99,7 +101,7 @@
* @param gbStreamParam
* @return
*/
- @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈")
+ @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping(value = "/add")
@ResponseBody
public void add(@RequestBody GbStreamParam gbStreamParam){
@@ -118,7 +120,7 @@
* @param gbId
* @return
*/
- @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈")
+ @Operation(summary = "淇濆瓨鍥芥爣鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping(value = "/addWithGbid")
@ResponseBody
public void add(String gbId, String platformGbId, @RequestParam(required = false) String catalogGbId){
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
index 0b23a9c..56d192e 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
@@ -12,6 +13,7 @@
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +47,7 @@
* @param stream 娴乮d
* @return
*/
- @Operation(summary = "鏍规嵁搴旂敤鍚嶅拰娴乮d鑾峰彇鎾斁鍦板潃")
+ @Operation(summary = "鏍规嵁搴旂敤鍚嶅拰娴乮d鑾峰彇鎾斁鍦板潃", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
@Parameter(name = "mediaServerId", description = "濯掍綋鏈嶅姟鍣╥d")
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index 870dee0..471d3df 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
@@ -21,6 +22,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +85,7 @@
*
* @return
*/
- @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�")
+ @Operation(summary = "鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping("/server_config")
public JSONObject serverConfig() {
JSONObject result = new JSONObject();
@@ -99,7 +101,7 @@
*
* @return
*/
- @Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�")
+ @Operation(summary = "鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "骞冲彴鍥芥爣缂栧彿", required = true)
@GetMapping("/info/{id}")
public ParentPlatform getPlatform(@PathVariable String id) {
@@ -119,7 +121,7 @@
* @return
*/
@GetMapping("/query/{count}/{page}")
- @Operation(summary = "鍒嗛〉鏌ヨ绾ц仈骞冲彴")
+ @Operation(summary = "鍒嗛〉鏌ヨ绾ц仈骞冲彴", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count) {
@@ -140,7 +142,7 @@
* @param parentPlatform
* @return
*/
- @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅")
+ @Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/add")
@ResponseBody
public void addPlatform(@RequestBody ParentPlatform parentPlatform) {
@@ -185,7 +187,7 @@
* @param parentPlatform
* @return
*/
- @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅")
+ @Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/save")
@ResponseBody
public void savePlatform(@RequestBody ParentPlatform parentPlatform) {
@@ -216,7 +218,7 @@
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
- @Operation(summary = "鍒犻櫎涓婄骇骞冲彴")
+ @Operation(summary = "鍒犻櫎涓婄骇骞冲彴", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@DeleteMapping("/delete/{serverGBId}")
@ResponseBody
@@ -273,7 +275,7 @@
* @param serverGBId 涓婄骇骞冲彴鍥芥爣ID
* @return
*/
- @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪")
+ @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@GetMapping("/exit/{serverGBId}")
@ResponseBody
@@ -294,7 +296,7 @@
* @param channelType 閫氶亾绫诲瀷
* @return
*/
- @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪")
+ @Operation(summary = "鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
@Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@@ -331,7 +333,7 @@
* @param param 閫氶亾鍏宠仈鍙傛暟
* @return
*/
- @Operation(summary = "鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾")
+ @Operation(summary = "鍚戜笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/update_channel_for_gb")
@ResponseBody
public void updateChannelForGB(@RequestBody UpdateChannelParam param) {
@@ -360,7 +362,7 @@
* @param param 閫氶亾鍏宠仈鍙傛暟
* @return
*/
- @Operation(summary = "浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾")
+ @Operation(summary = "浠庝笂绾у钩鍙扮Щ闄ゅ浗鏍囬�氶亾", security = @SecurityRequirement(name = JwtUtils.HEADER))
@DeleteMapping("/del_channel_for_gb")
@ResponseBody
public void delChannelForGB(@RequestBody UpdateChannelParam param) {
@@ -389,7 +391,7 @@
* @param parentId 鐩綍鐖禝D
* @return
*/
- @Operation(summary = "鑾峰彇鐩綍")
+ @Operation(summary = "鑾峰彇鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "platformId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�", required = true)
@Parameter(name = "parentId", description = "鐖剁骇鐩綍鐨勫浗鏍囩紪鍙�", required = true)
@GetMapping("/catalog")
@@ -420,7 +422,7 @@
* @param platformCatalog 鐩綍
* @return
*/
- @Operation(summary = "娣诲姞鐩綍")
+ @Operation(summary = "娣诲姞鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/catalog/add")
@ResponseBody
public void addCatalog(@RequestBody PlatformCatalog platformCatalog) {
@@ -445,7 +447,7 @@
* @param platformCatalog 鐩綍
* @return
*/
- @Operation(summary = "缂栬緫鐩綍")
+ @Operation(summary = "缂栬緫鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@PostMapping("/catalog/edit")
@ResponseBody
public void editCatalog(@RequestBody PlatformCatalog platformCatalog) {
@@ -471,7 +473,7 @@
* @param platformId 骞冲彴Id
* @return
*/
- @Operation(summary = "鍒犻櫎鐩綍")
+ @Operation(summary = "鍒犻櫎鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "鐩綍Id", required = true)
@Parameter(name = "platformId", description = "骞冲彴Id", required = true)
@DeleteMapping("/catalog/del")
@@ -506,7 +508,7 @@
* @param platformCatalog 鍏宠仈鐨勪俊鎭�
* @return
*/
- @Operation(summary = "鍒犻櫎鍏宠仈")
+ @Operation(summary = "鍒犻櫎鍏宠仈", security = @SecurityRequirement(name = JwtUtils.HEADER))
@DeleteMapping("/catalog/relation/del")
@ResponseBody
public void delRelation(@RequestBody PlatformCatalog platformCatalog) {
@@ -529,7 +531,7 @@
* @param catalogId 鐩綍Id
* @return
*/
- @Operation(summary = "淇敼榛樿鐩綍")
+ @Operation(summary = "淇敼榛樿鐩綍", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "catalogId", description = "鐩綍Id", required = true)
@Parameter(name = "platformId", description = "骞冲彴Id", required = true)
@PostMapping("/catalog/default/update")
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 6db7e4b..968d79e 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -9,6 +9,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
@@ -30,6 +31,7 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,7 +89,7 @@
@Autowired
private UserSetting userSetting;
- @Operation(summary = "寮�濮嬬偣鎾�")
+ @Operation(summary = "寮�濮嬬偣鎾�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
@@ -152,7 +154,7 @@
return result;
}
- @Operation(summary = "鍋滄鐐规挱")
+ @Operation(summary = "鍋滄鐐规挱", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "isSubStream", description = "鏄惁瀛愮爜娴侊紙true-瀛愮爜娴侊紝false-涓荤爜娴侊級锛岄粯璁や负false", required = true)
@@ -197,7 +199,7 @@
* 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
* @param streamId 娴両D
*/
- @Operation(summary = "灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac")
+ @Operation(summary = "灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "瑙嗛娴両D", required = true)
@PostMapping("/convert/{streamId}")
public JSONObject playConvert(@PathVariable String streamId) {
@@ -239,7 +241,7 @@
/**
* 缁撴潫杞爜
*/
- @Operation(summary = "缁撴潫杞爜")
+ @Operation(summary = "缁撴潫杞爜", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "key", description = "瑙嗛娴乲ey", required = true)
@Parameter(name = "mediaServerId", description = "娴佸獟浣撴湇鍔D", required = true)
@PostMapping("/convertStop/{key}")
@@ -264,7 +266,7 @@
}
}
- @Operation(summary = "璇煶骞挎挱鍛戒护")
+ @Operation(summary = "璇煶骞挎挱鍛戒护", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/broadcast/{deviceId}")
@PostMapping("/broadcast/{deviceId}")
@@ -330,7 +332,7 @@
return result;
}
- @Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
+ @Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping("/ssrc")
public JSONObject getSSRC() {
if (logger.isDebugEnabled()) {
@@ -353,7 +355,7 @@
return jsonObject;
}
- @Operation(summary = "鑾峰彇鎴浘")
+ @Operation(summary = "鑾峰彇鎴浘", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "isSubStream", description = "鏄惁瀛愮爜娴侊紙true-瀛愮爜娴侊紝false-涓荤爜娴侊級锛岄粯璁や负false", required = true)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index 63299b2..44431cf 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -7,6 +7,7 @@
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.ServiceException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -20,6 +21,7 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +70,7 @@
@Autowired
private UserSetting userSetting;
- @Operation(summary = "寮�濮嬭棰戝洖鏀�")
+ @Operation(summary = "寮�濮嬭棰戝洖鏀�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@@ -125,7 +127,7 @@
}
- @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "stream", description = "娴両D", required = true)
@@ -149,7 +151,7 @@
}
- @Operation(summary = "鍥炴斁鏆傚仠")
+ @Operation(summary = "鍥炴斁鏆傚仠", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@GetMapping("/pause/{streamId}")
public void playPause(@PathVariable String streamId) {
@@ -165,7 +167,7 @@
}
- @Operation(summary = "鍥炴斁鎭㈠")
+ @Operation(summary = "鍥炴斁鎭㈠", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@GetMapping("/resume/{streamId}")
public void playResume(@PathVariable String streamId) {
@@ -180,7 +182,7 @@
}
- @Operation(summary = "鍥炴斁鎷栧姩鎾斁")
+ @Operation(summary = "鍥炴斁鎷栧姩鎾斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@Parameter(name = "seekTime", description = "鎷栧姩鍋忕Щ閲忥紝鍗曚綅s", required = true)
@GetMapping("/seek/{streamId}/{seekTime}")
@@ -200,7 +202,7 @@
}
}
- @Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�")
+ @Operation(summary = "鍥炴斁鍊嶉�熸挱鏀�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "streamId", description = "鍥炴斁娴両D", required = true)
@Parameter(name = "speed", description = "鍊嶉��0.25 0.5 1銆�2銆�4", required = true)
@GetMapping("/speed/{streamId}/{speed}")
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
index 283cfe3..36047f0 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
@@ -10,6 +11,7 @@
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +52,7 @@
* @param zoomSpeed 缂╂斁閫熷害
*/
- @Operation(summary = "浜戝彴鎺у埗")
+ @Operation(summary = "浜戝彴鎺у埗", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "command", description = "鎺у埗鎸囦护,鍏佽鍊�: left, right, up, down, upleft, upright, downleft, downright, zoomin, zoomout, stop", required = true)
@@ -113,7 +115,7 @@
}
- @Operation(summary = "閫氱敤鍓嶇鎺у埗鍛戒护")
+ @Operation(summary = "閫氱敤鍓嶇鎺у埗鍛戒护", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "cmdCode", description = "鎸囦护鐮�", required = true)
@@ -137,7 +139,7 @@
}
- @Operation(summary = "棰勭疆浣嶆煡璇�")
+ @Operation(summary = "棰勭疆浣嶆煡璇�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/preset/query/{deviceId}/{channelId}")
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
index 7c33708..0f971ec 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
@@ -23,6 +24,7 @@
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +71,7 @@
@Autowired
private UserSetting userSetting;
- @Operation(summary = "褰曞儚鏌ヨ")
+ @Operation(summary = "褰曞儚鏌ヨ", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@@ -123,7 +125,7 @@
}
- @Operation(summary = "寮�濮嬪巻鍙插獟浣撲笅杞�")
+ @Operation(summary = "寮�濮嬪巻鍙插獟浣撲笅杞�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@@ -172,7 +174,7 @@
return result;
}
- @Operation(summary = "鍋滄鍘嗗彶濯掍綋涓嬭浇")
+ @Operation(summary = "鍋滄鍘嗗彶濯掍綋涓嬭浇", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "stream", description = "娴両D", required = true)
@@ -200,7 +202,7 @@
}
}
- @Operation(summary = "鑾峰彇鍘嗗彶濯掍綋涓嬭浇杩涘害")
+ @Operation(summary = "鑾峰彇鍘嗗彶濯掍綋涓嬭浇杩涘害", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@Parameter(name = "stream", description = "娴両D", required = true)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
index 937bc08..7ad595d 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.service.ILogService;
import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
import com.genersoft.iot.vmp.utils.DateUtil;
@@ -9,6 +10,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +44,7 @@
* @return
*/
@GetMapping("/all")
- @Operation(summary = "鍒嗛〉鏌ヨ鏃ュ織")
+ @Operation(summary = "鍒嗛〉鏌ヨ鏃ュ織", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "query", description = "鏌ヨ鍐呭", required = true)
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@@ -84,7 +86,7 @@
* 娓呯┖鏃ュ織
*
*/
- @Operation(summary = "娓呯┖鏃ュ織")
+ @Operation(summary = "娓呯┖鏃ュ織", security = @SecurityRequirement(name = JwtUtils.HEADER))
@DeleteMapping("/clear")
public void clear() {
logService.clear();
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
index d5fbf43..33b9d34 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/ps/PsController.java
@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
@@ -19,6 +20,7 @@
import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -69,7 +71,7 @@
@GetMapping(value = "/receive/open")
@ResponseBody
- @Operation(summary = "寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅")
+ @Operation(summary = "寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "isSend", description = "鏄惁鍙戦�侊紝false鏃跺彧寮�鍚敹娴侊紝 true鍚屾椂杩斿洖鎺ㄦ祦淇℃伅", required = true)
@Parameter(name = "callId", description = "鏁翠釜杩囩▼鐨勫敮涓�鏍囪瘑锛屼负浜嗕笌鍚庣画鎺ュ彛鍏宠仈", required = true)
@Parameter(name = "ssrc", description = "鏉ユ簮娴佺殑SSRC锛屼笉浼犲垯涓嶆牎楠屾潵婧恠src", required = false)
@@ -152,7 +154,7 @@
@GetMapping(value = "/receive/close")
@ResponseBody
- @Operation(summary = "鍏抽棴鏀舵祦")
+ @Operation(summary = "鍏抽棴鏀舵祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "stream", description = "娴佺殑ID", required = true)
public void closeRtpServer(String stream) {
logger.info("[绗笁鏂筆S鏈嶅姟瀵规帴->鍏抽棴鏀舵祦] stream->{}", stream);
@@ -170,7 +172,7 @@
@GetMapping(value = "/send/start")
@ResponseBody
- @Operation(summary = "鍙戦�佹祦")
+ @Operation(summary = "鍙戦�佹祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "ssrc", description = "鍙戦�佹祦鐨凷SRC", required = true)
@Parameter(name = "dstIp", description = "鐩爣鏀舵祦IP", required = true)
@Parameter(name = "dstPort", description = "鐩爣鏀舵祦绔彛", required = true)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
index a579c48..085a1f0 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
@@ -19,6 +20,7 @@
import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -69,7 +71,7 @@
@GetMapping(value = "/receive/open")
@ResponseBody
- @Operation(summary = "寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅")
+ @Operation(summary = "寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "isSend", description = "鏄惁鍙戦�侊紝false鏃跺彧寮�鍚敹娴侊紝 true鍚屾椂杩斿洖鎺ㄦ祦淇℃伅", required = true)
@Parameter(name = "callId", description = "鏁翠釜杩囩▼鐨勫敮涓�鏍囪瘑锛屼负浜嗕笌鍚庣画鎺ュ彛鍏宠仈", required = true)
@Parameter(name = "ssrc", description = "鏉ユ簮娴佺殑SSRC锛屼笉浼犲垯涓嶆牎楠屾潵婧恠src", required = false)
@@ -156,7 +158,7 @@
@GetMapping(value = "/receive/close")
@ResponseBody
- @Operation(summary = "鍏抽棴鏀舵祦")
+ @Operation(summary = "鍏抽棴鏀舵祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "stream", description = "娴佺殑ID", required = true)
public void closeRtpServer(String stream) {
logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鏀舵祦] stream->{}", stream);
@@ -175,7 +177,7 @@
@GetMapping(value = "/send/start")
@ResponseBody
- @Operation(summary = "鍙戦�佹祦")
+ @Operation(summary = "鍙戦�佹祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "ssrc", description = "鍙戦�佹祦鐨凷SRC", required = true)
@Parameter(name = "dstIpForAudio", description = "鐩爣闊抽鏀舵祦IP", required = false)
@Parameter(name = "dstIpForVideo", description = "鐩爣瑙嗛鏀舵祦IP", required = false)
@@ -351,7 +353,7 @@
@GetMapping(value = "/send/stop")
@ResponseBody
- @Operation(summary = "鍏抽棴鍙戦�佹祦")
+ @Operation(summary = "鍏抽棴鍙戦�佹祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "callId", description = "鏁翠釜杩囩▼鐨勫敮涓�鏍囪瘑锛屼笉浼犲垯浣跨敤闅忔満绔彛鍙戞祦", required = true)
public void closeSendRTP(String callId) {
logger.info("[绗笁鏂规湇鍔″鎺�->鍏抽棴鍙戦�佹祦] callId->{}", callId);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 72641be..d1c72fc 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
@@ -21,6 +22,7 @@
import com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -79,27 +81,27 @@
@GetMapping(value = "/media_server/list")
@ResponseBody
- @Operation(summary = "娴佸獟浣撴湇鍔″垪琛�")
+ @Operation(summary = "娴佸獟浣撴湇鍔″垪琛�", security = @SecurityRequirement(name = JwtUtils.HEADER))
public List<MediaServerItem> getMediaServerList() {
return mediaServerService.getAll();
}
@GetMapping(value = "/media_server/online/list")
@ResponseBody
- @Operation(summary = "鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�")
+ @Operation(summary = "鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�", security = @SecurityRequirement(name = JwtUtils.HEADER))
public List<MediaServerItem> getOnlineMediaServerList() {
return mediaServerService.getAllOnline();
}
@GetMapping(value = "/media_server/one/{id}")
@ResponseBody
- @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "娴佸獟浣撴湇鍔D", required = true)
public MediaServerItem getMediaServer(@PathVariable String id) {
return mediaServerService.getOne(id);
}
- @Operation(summary = "娴嬭瘯娴佸獟浣撴湇鍔�")
+ @Operation(summary = "娴嬭瘯娴佸獟浣撴湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "ip", description = "娴佸獟浣撴湇鍔P", required = true)
@Parameter(name = "port", description = "娴佸獟浣撴湇鍔TT绔彛", required = true)
@Parameter(name = "secret", description = "娴佸獟浣撴湇鍔ecret", required = true)
@@ -109,7 +111,7 @@
return mediaServerService.checkMediaServer(ip, port, secret);
}
- @Operation(summary = "娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�")
+ @Operation(summary = "娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "ip", description = "娴佸獟浣撴湇鍔P", required = true)
@Parameter(name = "port", description = "娴佸獟浣撴湇鍔TT绔彛", required = true)
@GetMapping(value = "/media_server/record/check")
@@ -121,7 +123,7 @@
}
}
- @Operation(summary = "淇濆瓨娴佸獟浣撴湇鍔�")
+ @Operation(summary = "淇濆瓨娴佸獟浣撴湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "mediaServerItem", description = "娴佸獟浣撲俊鎭�", required = true)
@PostMapping(value = "/media_server/save")
@ResponseBody
@@ -135,7 +137,7 @@
}
}
- @Operation(summary = "绉婚櫎娴佸獟浣撴湇鍔�")
+ @Operation(summary = "绉婚櫎娴佸獟浣撴湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "娴佸獟浣揑D", required = true)
@DeleteMapping(value = "/media_server/delete")
@ResponseBody
@@ -148,7 +150,7 @@
}
- @Operation(summary = "閲嶅惎鏈嶅姟")
+ @Operation(summary = "閲嶅惎鏈嶅姟", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping(value = "/restart")
@ResponseBody
public void restart() {
@@ -173,7 +175,7 @@
// });
};
- @Operation(summary = "鑾峰彇绯荤粺淇℃伅淇℃伅")
+ @Operation(summary = "鑾峰彇绯荤粺淇℃伅淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping(value = "/system/configInfo")
@ResponseBody
public SystemConfigInfo getConfigInfo() {
@@ -185,7 +187,7 @@
return systemConfigInfo;
}
- @Operation(summary = "鑾峰彇鐗堟湰淇℃伅")
+ @Operation(summary = "鑾峰彇鐗堟湰淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
@GetMapping(value = "/version")
@ResponseBody
public VersionPo VersionPogetVersion() {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
index e28ca11..9565000 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -16,6 +17,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +54,7 @@
private UserSetting userSetting;
- @Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�")
+ @Operation(summary = "鍒嗛〉鏌ヨ娴佷唬鐞�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�")
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺")
@Parameter(name = "query", description = "鏌ヨ鍐呭")
@@ -67,7 +69,7 @@
return streamProxyService.getAll(page, count);
}
- @Operation(summary = "鏌ヨ娴佷唬鐞�")
+ @Operation(summary = "鏌ヨ娴佷唬鐞�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�")
@Parameter(name = "stream", description = "娴両d")
@GetMapping(value = "/one")
@@ -77,7 +79,7 @@
return streamProxyService.getStreamProxyByAppAndStream(app, stream);
}
- @Operation(summary = "淇濆瓨浠ｇ悊", parameters = {
+ @Operation(summary = "淇濆瓨浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER), parameters = {
@Parameter(name = "param", description = "浠ｇ悊鍙傛暟", required = true),
})
@PostMapping(value = "/save")
@@ -131,7 +133,7 @@
@GetMapping(value = "/ffmpeg_cmd/list")
@ResponseBody
- @Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘")
+ @Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = true)
public JSONObject getFFmpegCMDs(@RequestParam String mediaServerId){
logger.debug("鑾峰彇鑺傜偣[ {} ]ffmpeg.cmd妯℃澘", mediaServerId );
@@ -145,7 +147,7 @@
@DeleteMapping(value = "/del")
@ResponseBody
- @Operation(summary = "绉婚櫎浠ｇ悊")
+ @Operation(summary = "绉婚櫎浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void del(@RequestParam String app, @RequestParam String stream){
@@ -159,7 +161,7 @@
@GetMapping(value = "/start")
@ResponseBody
- @Operation(summary = "鍚敤浠ｇ悊")
+ @Operation(summary = "鍚敤浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void start(String app, String stream){
@@ -172,7 +174,7 @@
@GetMapping(value = "/stop")
@ResponseBody
- @Operation(summary = "鍋滅敤浠ｇ悊")
+ @Operation(summary = "鍋滅敤浠ｇ悊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void stop(String app, String stream){
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 5c8bf36..8202bf5 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
@@ -20,6 +21,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +66,7 @@
@GetMapping(value = "/list")
@ResponseBody
- @Operation(summary = "鎺ㄦ祦鍒楄〃鏌ヨ")
+ @Operation(summary = "鎺ㄦ祦鍒楄〃鏌ヨ", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�")
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺")
@Parameter(name = "query", description = "鏌ヨ鍐呭")
@@ -88,7 +90,7 @@
@PostMapping(value = "/save_to_gb")
@ResponseBody
- @Operation(summary = "灏嗘帹娴佹坊鍔犲埌鍥芥爣")
+ @Operation(summary = "灏嗘帹娴佹坊鍔犲埌鍥芥爣", security = @SecurityRequirement(name = JwtUtils.HEADER))
public void saveToGB(@RequestBody GbStream stream){
if (!streamPushService.saveToGB(stream)){
throw new ControllerException(ErrorCode.ERROR100);
@@ -98,7 +100,7 @@
@DeleteMapping(value = "/remove_form_gb")
@ResponseBody
- @Operation(summary = "灏嗘帹娴佺Щ鍑哄埌鍥芥爣")
+ @Operation(summary = "灏嗘帹娴佺Щ鍑哄埌鍥芥爣", security = @SecurityRequirement(name = JwtUtils.HEADER))
public void removeFormGB(@RequestBody GbStream stream){
if (!streamPushService.removeFromGB(stream)){
throw new ControllerException(ErrorCode.ERROR100);
@@ -108,7 +110,7 @@
@PostMapping(value = "/stop")
@ResponseBody
- @Operation(summary = "涓涓�涓帹娴�")
+ @Operation(summary = "涓涓�涓帹娴�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
public void stop(String app, String streamId){
@@ -119,7 +121,7 @@
@DeleteMapping(value = "/batchStop")
@ResponseBody
- @Operation(summary = "涓澶氫釜鎺ㄦ祦")
+ @Operation(summary = "涓澶氫釜鎺ㄦ祦", security = @SecurityRequirement(name = JwtUtils.HEADER))
public void batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
if (batchGBStreamParam.getGbStreams().size() == 0) {
throw new ControllerException(ErrorCode.ERROR100);
@@ -231,7 +233,7 @@
*/
@GetMapping(value = "/getPlayUrl")
@ResponseBody
- @Operation(summary = "鑾峰彇鎺ㄦ祦鎾斁鍦板潃")
+ @Operation(summary = "鑾峰彇鎺ㄦ祦鎾斁鍦板潃", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
@Parameter(name = "mediaServerId", description = "濯掍綋鏈嶅姟鍣╥d")
@@ -261,7 +263,7 @@
*/
@PostMapping(value = "/add")
@ResponseBody
- @Operation(summary = "娣诲姞鎺ㄦ祦淇℃伅")
+ @Operation(summary = "娣诲姞鎺ㄦ祦淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
public void add(@RequestBody StreamPushItem stream){
if (ObjectUtils.isEmpty(stream.getGbId())) {
throw new ControllerException(ErrorCode.ERROR400.getCode(), "鍥芥爣ID涓嶅彲涓虹┖");
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java
index f34f1c4..815b239 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.vmanager.user;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.conf.security.JwtUtils;
import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.service.IRoleService;
import com.genersoft.iot.vmp.storager.dao.dto.Role;
@@ -8,6 +9,7 @@
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,7 @@
private IRoleService roleService;
@PostMapping("/add")
- @Operation(summary = "娣诲姞瑙掕壊")
+ @Operation(summary = "娣诲姞瑙掕壊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "name", description = "瑙掕壊鍚�", required = true)
@Parameter(name = "authority", description = "鏉冮檺锛堣嚜琛屽畾涔夊唴瀹癸紝鐩墠鏈娇鐢級", required = true)
public void add(@RequestParam String name,
@@ -49,7 +51,7 @@
}
@DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎瑙掕壊")
+ @Operation(summary = "鍒犻櫎瑙掕壊", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "鐢ㄦ埛Id", required = true)
public void delete(@RequestParam Integer id){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
@@ -66,7 +68,7 @@
}
@GetMapping("/all")
- @Operation(summary = "鏌ヨ瑙掕壊")
+ @Operation(summary = "鏌ヨ瑙掕壊", security = @SecurityRequirement(name = JwtUtils.HEADER))
public List<Role> all(){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
List<Role> allRoles = roleService.getAll();
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index b6f9183..9d55206 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -14,6 +14,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
@@ -66,7 +67,7 @@
@PostMapping("/changePassword")
- @Operation(summary = "淇敼瀵嗙爜")
+ @Operation(summary = "淇敼瀵嗙爜", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "oldpassword", description = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@@ -95,7 +96,7 @@
@PostMapping("/add")
- @Operation(summary = "娣诲姞鐢ㄦ埛")
+ @Operation(summary = "娣诲姞鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "password", description = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@Parameter(name = "roleId", description = "瑙掕壊ID", required = true)
@@ -131,7 +132,7 @@
}
@DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鐢ㄦ埛")
+ @Operation(summary = "鍒犻櫎鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "鐢ㄦ埛Id", required = true)
public void delete(@RequestParam Integer id){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
@@ -147,7 +148,7 @@
}
@GetMapping("/all")
- @Operation(summary = "鏌ヨ鐢ㄦ埛")
+ @Operation(summary = "鏌ヨ鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
public List<User> all(){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
return userService.getAllUsers();
@@ -161,7 +162,7 @@
* @return 鍒嗛〉鐢ㄦ埛鍒楄〃
*/
@GetMapping("/users")
- @Operation(summary = "鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Operation(summary = "鍒嗛〉鏌ヨ鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
public PageInfo<User> users(int page, int count) {
@@ -169,7 +170,7 @@
}
@RequestMapping("/changePushKey")
- @Operation(summary = "淇敼pushkey")
+ @Operation(summary = "淇敼pushkey", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "userId", description = "鐢ㄦ埛Id", required = true)
@Parameter(name = "pushKey", description = "鏂扮殑pushKey", required = true)
public void changePushKey(@RequestParam Integer userId,@RequestParam String pushKey) {
@@ -187,7 +188,7 @@
}
@PostMapping("/changePasswordForAdmin")
- @Operation(summary = "绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�")
+ @Operation(summary = "绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "adminId", description = "绠＄悊鍛榠d", required = true)
@Parameter(name = "userId", description = "鐢ㄦ埛id", required = true)
@Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 612416b..5547913 100755
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -33,98 +33,156 @@
<el-option label="娴佺晠" :value="true"></el-option>
</el-select>
</div>
- <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
- <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
- <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
+ <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
+ <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
+ </div>
</div>
- </div>
- <devicePlayer ref="devicePlayer" ></devicePlayer>
- <el-container v-loading="isLoging" style="height: 82vh;">
- <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree" >
- <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent" ></DeviceTree>
- </el-aside>
- <el-main style="padding: 5px;">
- <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header">
- <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200">
- </el-table-column>
- <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200">
- </el-table-column>
- <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200">
- </el-table-column>
- <el-table-column label="蹇収" min-width="120">
- <template v-slot:default="scope">
- <el-image
- :src="getSnap(scope.row)"
- :preview-src-list="getBigSnap(scope.row)"
- @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
- :fit="'contain'"
- style="width: 60px">
- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
+ <devicePlayer ref="devicePlayer"></devicePlayer>
+ <el-container v-loading="isLoging" style="height: 82vh;">
+ <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree">
+ <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent"></DeviceTree>
+ </el-aside>
+ <el-main style="padding: 5px;">
+ <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%"
+ header-row-class-name="table-header">
+ <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200">
+ </el-table-column>
+ <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200">
+ </el-table-column>
+ <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200">
+ <template v-slot:default="scope">
+ <el-input
+ v-show="scope.row.edit"
+ v-model="scope.row.name"
+ placeholder="閫氶亾鍚嶇О"
+ :maxlength="255"
+ show-word-limit
+ clearable
+ />
+ <span v-show="!scope.row.edit">{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="蹇収" min-width="120">
+ <template v-slot:default="scope">
+ <el-image
+ :src="getSnap(scope.row)"
+ :preview-src-list="getBigSnap(scope.row)"
+ @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
+ :fit="'contain'"
+ style="width: 60px">
+ <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div>
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="120">
+ </el-table-column>
+ <el-table-column prop="manufacture" label="鍘傚" min-width="120">
+ </el-table-column>
+ <el-table-column label="浣嶇疆淇℃伅" min-width="200">
+ <template v-slot:default="scope">
+ <el-input
+ v-show="scope.row.edit"
+ v-model="scope.row.location"
+ placeholder="渚嬶細117.234,36.378"
+ :maxlength="30"
+ show-word-limit
+ clearable
+ />
+ <span v-show="!scope.row.edit">{{ scope.row.location }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="PTZType" label="浜戝彴绫诲瀷" min-width="120">
+ <template v-slot:default="scope">
+ <el-select v-show="scope.row.edit" v-model="scope.row.PTZType"
+ placeholder="浜戝彴绫诲瀷" filterable>
+ <el-option
+ v-for="(value, key) in ptzTypes"
+ :key="key"
+ :label="value"
+ :value="key"
+ />
+ </el-select>
+ <div v-show="!scope.row.edit">{{ scope.row.PTZTypeText }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="寮�鍚煶棰�" min-width="120">
+ <template slot-scope="scope">
+ <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐘舵��" min-width="120">
+ <template slot-scope="scope">
+ <div slot="reference" class="name-wrapper">
+ <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag>
</div>
- </el-image>
- </template>
- </el-table-column>
- <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="120">
- </el-table-column>
- <el-table-column prop="manufacture" label="鍘傚" min-width="120">
- </el-table-column>
- <el-table-column label="浣嶇疆淇℃伅" min-width="200">
- <template slot-scope="scope">
- <span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span>
- <span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span>
- </template>
- </el-table-column>
- <el-table-column prop="PTZTypeText" label="浜戝彴绫诲瀷" min-width="120"/>
- <el-table-column label="寮�鍚煶棰�" min-width="120">
- <template slot-scope="scope">
- <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" min-width="120">
- <template slot-scope="scope">
- <div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag>
- <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag>
- </div>
- </template>
- </el-table-column>
+ </template>
+ </el-table-column>
- <el-table-column label="鎿嶄綔" min-width="280" fixed="right">
- <template slot-scope="scope">
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">鎾斁</el-button>
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-switch-button" type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
- @click="stopDevicePush(scope.row)">鍋滄
- </el-button>
- <el-divider direction="vertical"></el-divider>
- <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
- @click="changeSubchannel(scope.row)">鏌ョ湅
- </el-button>
- <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
- </el-button>
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"
- type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination
- style="float: right"
- @size-change="handleSizeChange"
- @current-change="currentChange"
- :current-page="currentPage"
- :page-size="count"
- :page-sizes="[15, 25, 35, 50]"
- layout="total, sizes, prev, pager, next"
- :total="total">
- </el-pagination>
- </el-main>
- </el-container>
+ <el-table-column label="鎿嶄綔" min-width="340" fixed="right">
+ <template slot-scope="scope">
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play"
+ type="text" @click="sendDevicePush(scope.row)">鎾斁
+ </el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
+ icon="el-icon-switch-button"
+ type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
+ @click="stopDevicePush(scope.row)">鍋滄
+ </el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button
+ v-if="scope.row.edit"
+ size="medium"
+ type="text"
+ icon="el-icon-edit-outline"
+ @click="handleSave(scope.row)"
+ >
+ 淇濆瓨
+ </el-button>
+ <el-button
+ v-else
+ size="medium"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleEdit(scope.row)"
+ >
+ 缂栬緫
+ </el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-s-open" type="text"
+ v-if="scope.row.subCount > 0 || scope.row.parental === 1"
+ @click="changeSubchannel(scope.row)">鏌ョ湅
+ </el-button>
+ <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
+ icon="el-icon-video-camera"
+ type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
+ </el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"
+ type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ style="float: right"
+ @size-change="handleSizeChange"
+ @current-change="currentChange"
+ :current-page="currentPage"
+ :page-size="count"
+ :page-sizes="[15, 25, 35, 50]"
+ layout="total, sizes, prev, pager, next"
+ :total="total">
+ </el-pagination>
+ </el-main>
+ </el-container>
- <!--璁惧鍒楄〃-->
+ <!--璁惧鍒楄〃-->
</div>
</template>
@@ -163,16 +221,23 @@
beforeUrl: "/deviceList",
isLoging: false,
showTree: false,
- loadSnap: {}
+ loadSnap: {},
+ ptzTypes: {
+ 0: "鏈煡",
+ 1: "鐞冩満",
+ 2: "鍗婄悆",
+ 3: "鍥哄畾鏋満",
+ 4: "閬ユ帶鏋満"
+ }
};
},
mounted() {
if (this.deviceId) {
- this.deviceService.getDevice(this.deviceId, (result)=>{
- this.device = result;
+ this.deviceService.getDevice(this.deviceId, (result) => {
+ this.device = result;
- }, (error)=>{
+ }, (error) => {
console.log("鑾峰彇璁惧淇℃伅澶辫触")
console.error(error)
})
@@ -227,6 +292,14 @@
if (res.data.code === 0) {
that.total = res.data.data.total;
that.deviceChannelList = res.data.data.list;
+ that.deviceChannelList.forEach(e => {
+ e.PTZType = e.PTZType + "";
+ that.$set(e, "edit", false);
+ that.$set(e, "location", "");
+ if (e.longitude && e.latitude) {
+ that.$set(e, "location", e.longitude + "," + e.latitude);
+ }
+ });
// 闃叉鍑虹幇琛ㄦ牸閿欎綅
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
@@ -248,7 +321,7 @@
this.$axios({
method: 'get',
url: '/api/play/start/' + deviceId + '/' + channelId,
- params:{
+ params: {
isSubStream: this.isSubStream
}
}).then(function (res) {
@@ -271,7 +344,7 @@
that.initData();
}, 1000)
- }else{
+ } else {
that.$message.error(res.data.msg);
}
}).catch(function (e) {
@@ -297,7 +370,7 @@
this.$axios({
method: 'get',
url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId,
- params:{
+ params: {
isSubStream: this.isSubStream
}
}).then(function (res) {
@@ -326,7 +399,7 @@
return;
}
setTimeout(() => {
- let url = (process.env.NODE_ENV === 'development'? "debug": "") + '/api/device/query/snap/' + deviceId + '/' + channelId
+ let url = (process.env.NODE_ENV === 'development' ? "debug" : "") + '/api/device/query/snap/' + deviceId + '/' + channelId
this.loadSnap[deviceId + channelId]++
document.getElementById(deviceId + channelId).setAttribute("src", url + '?' + new Date().getTime())
}, 1000)
@@ -363,10 +436,18 @@
online: this.online,
channelType: this.channelType
}
- }).then( (res) =>{
+ }).then((res) => {
if (res.data.code === 0) {
this.total = res.data.data.total;
this.deviceChannelList = res.data.data.list;
+ this.deviceChannelList.forEach(e => {
+ e.PTZType = e.PTZType + "";
+ this.$set(e, "edit", false);
+ this.$set(e, "location", "");
+ if (e.longitude && e.latitude) {
+ this.$set(e, "location", e.longitude + "," + e.latitude);
+ }
+ });
// 闃叉鍑虹幇琛ㄦ牸閿欎綅
this.$nextTick(() => {
this.$refs.channelListTable.doLayout();
@@ -376,7 +457,7 @@
}).catch(function (error) {
console.log(error);
});
- }else {
+ } else {
this.$axios({
method: 'get',
url: `/api/device/query/tree/channel/${this.deviceId}`,
@@ -385,7 +466,7 @@
page: this.currentPage,
count: this.count,
}
- }).then((res)=> {
+ }).then((res) => {
if (res.data.code === 0) {
this.total = res.data.total;
this.deviceChannelList = res.data.list;
@@ -417,14 +498,14 @@
refresh: function () {
this.initData();
},
- switchTree: function (){
+ switchTree: function () {
this.showTree = true;
this.deviceChannelList = [];
this.parentChannelId = 0;
this.currentPage = 1;
},
- switchList: function (){
+ switchList: function () {
this.showTree = false;
this.deviceChannelList = [];
this.parentChannelId = 0;
@@ -435,12 +516,70 @@
console.log(device)
if (!!!data.channelId) {
this.parentChannelId = device.deviceId;
- }else {
+ } else {
this.parentChannelId = data.channelId;
}
this.initData();
- }
+ },
+ // 淇濆瓨
+ handleSave(row) {
+ if (row.location) {
+ const segements = row.location.split(",");
+ if (segements.length !== 2) {
+ this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
+ return;
+ } else {
+ row.longitude = parseFloat(segements[0]);
+ row.latitude = parseFloat(segements[1]);
+ if (!(row.longitude && row.latitude)) {
+ this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
+ return;
+ }
+ }
+ } else {
+ delete row.longitude;
+ delete row.latitude;
+ }
+ Object.keys(row).forEach(key => {
+ const value = row[key];
+ if (value === null || value === undefined || (typeof value === "string" && value.trim() === "")) {
+ delete row[key];
+ }
+ });
+ this.$axios({
+ method: 'post',
+ url: `/api/device/query/channel/update/${this.deviceId}`,
+ params: row
+ }).then(response => {
+ if (response.data.code === 0) {
+ this.$message.success("淇敼鎴愬姛锛�");
+ this.initData();
+ } else {
+ this.$message.error("淇敼澶辫触锛�");
+ }
+ }).catch(_ => {
+ this.$message.error("淇敼澶辫触锛�");
+ })
+ },
+ // 鏄惁姝ｅ湪缂栬緫
+ isEdit() {
+ let editing = false;
+ this.deviceChannelList.forEach(e => {
+ if (e.edit) {
+ editing = true;
+ }
+ });
+ return editing;
+ },
+ // 缂栬緫
+ handleEdit(row) {
+ if (this.isEdit()) {
+ this.$message.warning('璇蜂繚瀛樺綋鍓嶇紪杈戦」锛�');
+ } else {
+ row.edit = true;
+ }
+ }
}
};
</script>
--
Gitblit v1.8.0