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 |   66 ++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 21 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 c18010a..14d3f6c 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -44,7 +44,7 @@
         SELECT id, mechanismName as mechanismname, tpUrl as tpurl
         FROM `sys_architecture`
         WHERE campus = #{campus}
-          and type = #{type}
+          and type = #{type} and is_deleted = 0
     </select>
 
     <!--查询校内建筑基本信息-->
@@ -67,7 +67,7 @@
                roll,
                panoramaurl
         FROM `sys_architecture`
-        WHERE id = #{id}
+        WHERE id = #{id} and is_deleted = 0
     </select>
 
 
@@ -75,32 +75,32 @@
         SELECT jd, wd, mechanismName as mechanismname, tpUrl as tpurl, codeUrl as codeurl, introduce,panoramaurl
         FROM sys_architecture
         WHERE panoramaurl IS NOT NULL
-          AND panoramaurl!=''
+          AND panoramaurl!='' and is_deleted = 0
     </select>
     <select id="selectArchALL" resultType="java.util.HashMap">
         SELECT jd, wd, mechanismName as mechanismname, tpUrl as tpurl, codeUrl as codeurl, introduce,panoramaurl
-        FROM sys_architecture
+        FROM sys_architecture where is_deleted = 0
     </select>
 
     <select id="selectIns" resultType="java.lang.String">
         SELECT GROUP_CONCAT(mechanismName) AS mechanismname
         FROM sys_life
-        WHERE loutype = #{id}
+        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}%'
-    </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">
@@ -109,20 +109,44 @@
                videourl
         FROM sys_architecture
         WHERE videourl IS NOT NULL
-          AND videourl != ''
+          AND videourl != '' and is_deleted = 0
         UNION
         SELECT jd,
                wd, mechanismName as mechanismname,
                videourl
         FROM sys_mechanism
         WHERE videourl IS NOT NULL
-          AND videourl != ''
+          AND videourl != '' and is_deleted = 0
         UNION
         SELECT jd,
                wd, mechanismName as mechanismname,
                videourl
         FROM sys_life
         WHERE videourl IS NOT NULL
-          AND videourl != ''
+          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