From 04f3511fb3f3598cfb1646ba7ab58bf20e1a0de3 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Wed, 28 Apr 2021 17:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96mysql=E5=BB=BA=E5=BA=93?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/mysql.sql                                          | 10 +++++-----
 .../transmit/request/impl/MessageRequestProcessor.java |  4 +++-
 .../iot/vmp/storager/dao/DeviceChannelMapper.java      |  2 +-
 src/main/resources/application-dev.yml                 |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sql/mysql.sql b/sql/mysql.sql
index bfed62ee..6dec217b 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -46,7 +46,7 @@ create table device_channel
     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 @@ create table parent_platform
     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 @@ create table stream_proxy
     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 c2f624fe..114ffd45 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 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 				} 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 66162fc3..d11f70b5 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 @@ public interface DeviceChannelMapper {
             "<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 a0e8cc5d..2ca6e8f6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,8 +13,8 @@ spring:
         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