From faed220f73120adc7029678cb0f8cfd2cc9fe4c6 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 25 Jan 2024 17:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=20=E8=A7=86=E9=A2=91=E7=9C=8B=E4=B8=8D=E4=BA=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyProjects/PlatformvideomanagementController.java      | 6 +++---
 .../mybatis/datasource/mkmj/MkmjAreaGateMapper.xml          | 1 +
 .../resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml    | 1 +
 .../mybatis/datasource/mkmj/MkmjGateVideoMapper.xml         | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
index 9b536ed7..0f41a466 100644
--- a/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
+++ b/src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
@@ -55,7 +55,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
@@ -71,7 +71,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp");
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
@@ -87,7 +87,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.cameraSearch(pd);
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml
index e26e7379..0bf78803 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml
@@ -156,6 +156,7 @@
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 				(
+				f.GATE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 				<!--	根据需求自己加检索条件
 					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 					 or
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml
index 72e79457..4056b692 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaMapper.xml
@@ -122,6 +122,7 @@
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 				(
+				f.AREA_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 				<!--	根据需求自己加检索条件
 					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 					 or
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml
index d275b08c..caac1ad9 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml
@@ -112,7 +112,8 @@
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
 		<include refid="Field"></include>,
-		r.NAME
+		r.NAME,
+		r.INDEXCODE
 		from
 		<include refid="tableName"></include> f
 		LEFT JOIN 	`qa-gwj-regulatory`.bus_platformvideomanagement r on r.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
@@ -120,6 +121,7 @@
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 				(
+				r.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 				<!--	根据需求自己加检索条件
 					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 					 or