From abd569d79a346d9066c4b239dbc452861b26a6cb Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期二, 08 六月 2021 14:43:03 +0800
Subject: [PATCH] 添加注册失败时回复403避免陷入401循环
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
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 6d3b031..0be9b19 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
@@ -1,8 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -17,15 +16,15 @@
@Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
"address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
- "ipAddress, port, password, PTZType, status) " +
+ "ipAddress, port, password, PTZType, status, streamId, longitude, latitude, createTime, updateTime) " +
"VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
"'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
- "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})")
+ "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}', ${longitude}, ${latitude}, datetime('now','localtime'), datetime('now','localtime'))")
int add(DeviceChannel channel);
@Update(value = {" <script>" +
"UPDATE device_channel " +
- "SET deviceId='${deviceId}'" +
+ "SET updateTime=datetime('now','localtime')" +
"<if test=\"name != null\">, name='${name}'</if>" +
"<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" +
"<if test=\"model != null\">, model='${model}'</if>" +
@@ -47,7 +46,9 @@
"<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>" +
+ "<if test=\"longitude != null\">, longitude=${longitude}</if>" +
+ "<if test=\"latitude != null\">, latitude=${latitude}</if>" +
"WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
" </script>"})
int update(DeviceChannel channel);
--
Gitblit v1.8.0