From ea1871b0bfc184c7fc51c9b710bb480221bd6623 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Tue, 23 Jan 2024 18:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mkmj/impl/MkmjGateVideServiceImpl.java |  1 +
 .../mybatis/datasource/mkmj/MkmjAreaGateMapper.xml | 10 +++++++++-
 .../datasource/mkmj/MkmjGateVideoMapper.xml        | 14 ++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java
index 5ea257eb..16d85775 100644
--- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java
+++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java
@@ -33,6 +33,7 @@ public class MkmjGateVideServiceImpl implements MkmjGateVideoService {
 	 * @throws Exception
 	 */
 	public ReturnMap save(PageData pd)throws Exception{
+		pd.put("GATE_VIDEO_ID",UuidUtil.get32UUID());
 		mkmjGateVideoMapper.save(pd);
 		return ReturnMap.ok("保存成功");
 	}
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml
index a387376c..f27e199e 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml
@@ -139,9 +139,17 @@
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		ifnull(v.VIDEOCOUNT,0) VIDEOCOUNT
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN (SELECT
+				AREA_GATE_ID ,COUNT(GATE_VIDEO_ID)  VIDEOCOUNT
+				FROM
+				`mkmj_gate_video`
+				WHERE
+				ISDELETE = '0'
+				GROUP BY AREA_GATE_ID ) v on v.AREA_GATE_ID = f.AREA_GATE_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml
index 2f1d7ef9..fd69ddea 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml
@@ -16,7 +16,7 @@
 	<sql id="Field">
 		f.GATE_VIDEO_ID,
 		f.AREA_GATE_ID,
-		f.VIDEO_RESOURCES_ID,
+		f.PLATFORMVIDEOMANAGEMENT_ID,
 		f.LONGITUDE,
 		f.LATITUDE,
 		f.CORPINFO_ID,
@@ -31,7 +31,7 @@
 	<sql id="Field2">
 		GATE_VIDEO_ID,
 		AREA_GATE_ID,
-		VIDEO_RESOURCES_ID,
+		PLATFORMVIDEOMANAGEMENT_ID,
 		LONGITUDE,
 		LATITUDE,
 		CORPINFO_ID,
@@ -46,7 +46,7 @@
 	<sql id="FieldValue">
 		#{GATE_VIDEO_ID},
 		#{AREA_GATE_ID},
-		#{VIDEO_RESOURCES_ID},
+		#{PLATFORMVIDEOMANAGEMENT_ID},
 		#{LONGITUDE},
 		#{LATITUDE},
 		#{CORPINFO_ID},
@@ -85,7 +85,7 @@
 		set
 			GATE_VIDEO_ID= GATE_VIDEO_ID,
 			AREA_GATE_ID=#{AREA_GATE_ID},
-			VIDEO_RESOURCES_ID=#{VIDEO_RESOURCES_ID},
+			PLATFORMVIDEOMANAGEMENT_ID=#{PLATFORMVIDEOMANAGEMENT_ID},
 			LONGITUDE=#{LONGITUDE},
 			LATITUDE=#{LATITUDE},
 			CORPINFO_ID=#{CORPINFO_ID},
@@ -111,9 +111,11 @@
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		r.NAME
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN 	`qa-gwj-regulatory`.bus_platformvideomanagement r on r.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
@@ -126,7 +128,7 @@
 				)
 		</if>
 		<if test="pd.AREA_GATE_ID != null and pd.AREA_GATE_ID != ''">
-			f.AREA_GATE_ID = #{pd.AREA_GATE_ID}
+			AND f.AREA_GATE_ID = #{pd.AREA_GATE_ID}
 		</if>
 	</select>