From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
index b430ebb..9ac90bb 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
@@ -33,6 +33,19 @@
"mediaServerId=#{mediaServerId}," +
"status=${status} " +
"WHERE app=#{app} AND stream=#{stream}")
+ int updateByAppAndStream(GbStream gbStream);
+
+ @Update("UPDATE gb_stream " +
+ "SET app=#{app}," +
+ "stream=#{stream}," +
+ "gbId=#{gbId}," +
+ "name=#{name}," +
+ "streamType=#{streamType}," +
+ "longitude=#{longitude}, " +
+ "latitude=#{latitude}," +
+ "mediaServerId=#{mediaServerId}," +
+ "status=${status} " +
+ "WHERE gbStreamId=#{gbStreamId}")
int update(GbStream gbStream);
@Delete("DELETE FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
--
Gitblit v1.8.0