From 6be139d9a70902a7e4f16df0301378e3084420d5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 07 Mar 2022 08:42:33 +0800
Subject: [PATCH] 1。VR实景 2.文件上传接口
---
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
index 5112ddc..14d3f6c 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -66,8 +66,8 @@
pitch,
roll,
panoramaurl
- FROM `sys_architecture` and is_deleted = 0
- WHERE id = #{id}
+ FROM `sys_architecture`
+ WHERE id = #{id} and is_deleted = 0
</select>
@@ -88,19 +88,19 @@
WHERE loutype = #{id} and is_deleted = 0
</select>
- <select id="selectLook" resultType="java.util.HashMap">
- SELECT GROUP_CONCAT(mechanismName) AS mechanismname
- FROM sys_architecture
- WHERE mechanismName LIKE '%${mechanismName}%'
- UNION
- SELECT GROUP_CONCAT(mechanismName) AS mechanismname
- FROM sys_mechanism
- WHERE mechanismName LIKE '%${mechanismName}%'
- UNION
- SELECT GROUP_CONCAT(mechanismName) AS mechanismname
- FROM sys_life
- WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0
- </select>
+<!-- <select id="selectLook" resultType="java.util.HashMap">-->
+<!-- SELECT GROUP_CONCAT(mechanismName) AS mechanismname-->
+<!-- FROM sys_architecture-->
+<!-- WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0-->
+<!-- UNION-->
+<!-- SELECT GROUP_CONCAT(mechanismName) AS mechanismname-->
+<!-- FROM sys_mechanism-->
+<!-- WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0-->
+<!-- UNION-->
+<!-- SELECT GROUP_CONCAT(mechanismName) AS mechanismname-->
+<!-- FROM sys_life-->
+<!-- WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0-->
+<!-- </select>-->
<!--视频监控-->
<select id="selectVideo" resultType="java.util.HashMap">
@@ -125,4 +125,28 @@
WHERE videourl IS NOT NULL
AND videourl != '' and is_deleted = 0
</select>
+
+ <select id="selectLook" resultType="java.util.HashMap">
+ SELECT
+ mechanismName AS mechanismname,address,telePhone AS telephone,introduce,jd,wd,gd,tpUrl as tpurl,codeUrl as codeurl,heading,pitch,roll,videourl,panoramaurl
+ FROM
+ sys_architecture
+ WHERE
+ mechanismName LIKE '%${mechanismName}%'
+ AND is_deleted = 0 UNION
+ SELECT
+ mechanismName AS mechanismname,address,telePhone AS telephone,introduce,jd,wd,gd,tpUrl as tpurl,codeUrl as codeurl,heading,pitch,roll,videourl,panoramaurl
+ FROM
+ sys_mechanism
+ WHERE
+ mechanismName LIKE '%${mechanismName}%'
+ AND is_deleted = 0 UNION
+ SELECT
+ mechanismName AS mechanismname,address,telePhone AS telephone,introduce,jd,wd,gd,tpUrl as tpurl,codeUrl as codeurl,heading,pitch,roll,videourl,panoramaurl
+ FROM
+ sys_life
+ WHERE
+ mechanismName LIKE '%${mechanismName}%'
+ AND is_deleted = 0
+ </select>
</mapper>
--
Gitblit v1.9.3