From 04f3511fb3f3598cfb1646ba7ab58bf20e1a0de3 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 28 四月 2021 17:52:11 +0800
Subject: [PATCH] 优化mysql建库脚本
---
sql/mysql.sql | 10 +++++-----
src/main/resources/application-dev.yml | 4 ++--
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 4 +++-
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index bfed62e..6dec217 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -46,7 +46,7 @@
streamId varchar(50) null,
deviceId varchar(50) not null,
parental varchar(50) null,
- hasAudio tinyint(1) null,
+ hasAudio bit(1) null,
primary key (channelId, deviceId)
);
@@ -100,7 +100,7 @@
characterSet varchar(50) null,
ptz int null,
rtcp int null,
- status tinyint(1) null
+ status bit(1) null
);
create table platform_gb_channel
@@ -131,9 +131,9 @@
timeout_ms int null,
ffmpeg_cmd_key varchar(50) null,
rtp_type varchar(50) null,
- enable_hls tinyint(1) null,
- enable_mp4 tinyint(1) null,
- enable tinyint(1) not null,
+ enable_hls bit(1) null,
+ enable_mp4 bit(1) null,
+ enable bit(1) not null,
primary key (app, stream)
);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index c2f624f..114ffd4 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -780,7 +780,9 @@
} else {
}
}else {
- logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧" + (device == null? "涓嶅瓨鍦�":"绂荤嚎") + ", 蹇冭烦淇℃伅涓嶄簣浠ュ洖澶�");
+ logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧" + (device == null? "涓嶅瓨鍦�":"绂荤嚎") + ", 鍥炲401");
+ Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());
+ getServerTransaction(evt).sendResponse(response);
}
} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
e.printStackTrace();
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 66162fc..d11f70b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -46,7 +46,7 @@
"<if test=\"PTZType != null\">, PTZType=${PTZType}</if>" +
"<if test=\"status != null\">, status='${status}'</if>" +
"<if test=\"streamId != null\">, streamId='${streamId}'</if>" +
- "<if test=\"hasAudio != null\">, hasAudio='${hasAudio}'</if>" +
+ "<if test=\"hasAudio != null\">, hasAudio=${hasAudio}</if>" +
"WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
" </script>"})
int update(DeviceChannel channel);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a0e8cc5..2ca6e8f 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,8 +13,8 @@
timeout: 10000
# [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
datasource:
- # name: eiot
- # url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ # name: wvp
+ # url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
# username:
# password:
# type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.8.0