From 0797cf409bd7e21c810caf571241fa57445ea9c4 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 19 Jan 2022 10:37:48 +0800
Subject: [PATCH] 初版本
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1 +
src/main/java/org/springblade/modules/hd/entity/Hd.java | 3 ++-
src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml | 2 +-
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 18 +++++++++---------
src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml | 2 +-
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index 420996d..e69d31c 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -70,6 +70,7 @@
secureRegistry.excludePathPatterns("/blade-road/road/**");
secureRegistry.excludePathPatterns("/blade-life/life/**");
secureRegistry.excludePathPatterns("/qrCode/**");
+ secureRegistry.excludePathPatterns("/blade-hd/hd/**");
return secureRegistry;
}
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..5112ddc 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>
<!--查询校内建筑基本信息-->
@@ -66,7 +66,7 @@
pitch,
roll,
panoramaurl
- FROM `sys_architecture`
+ FROM `sys_architecture` and is_deleted = 0
WHERE id = #{id}
</select>
@@ -75,17 +75,17 @@
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">
@@ -99,7 +99,7 @@
UNION
SELECT GROUP_CONCAT(mechanismName) AS mechanismname
FROM sys_life
- WHERE mechanismName LIKE '%${mechanismName}%'
+ WHERE mechanismName LIKE '%${mechanismName}%' and is_deleted = 0
</select>
<!--视频监控-->
@@ -109,20 +109,20 @@
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>
</mapper>
diff --git a/src/main/java/org/springblade/modules/hd/entity/Hd.java b/src/main/java/org/springblade/modules/hd/entity/Hd.java
index f60b35c..7564289 100644
--- a/src/main/java/org/springblade/modules/hd/entity/Hd.java
+++ b/src/main/java/org/springblade/modules/hd/entity/Hd.java
@@ -85,7 +85,8 @@
*/
@ApiModelProperty(value = "路线")
private String addressname;
-
+ private String sponsor;
+ private String undertake;
}
diff --git a/src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml b/src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml
index ce8eb2a..6c41c6a 100644
--- a/src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml
+++ b/src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml
@@ -37,6 +37,6 @@
<select id="selectList" resultType="java.util.HashMap">
- select jd,wd,mechanismName as mechanismname,tpUrl as tpurl,codeUrl as codeurl,introduce from sys_life where lifetype=#{lifetype}
+ select jd,wd,mechanismName as mechanismname,tpUrl as tpurl,codeUrl as codeurl,introduce from sys_life where lifetype=#{lifetype} and is_deleted = 0
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml b/src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml
index a1cd5a7..01d9ae3 100644
--- a/src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml
+++ b/src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml
@@ -26,7 +26,7 @@
<!--建筑所属楼信息-->
<select id="selectIn" resultType="java.lang.String">
- SELECT GROUP_CONCAT(mechanismName) as mechanismname FROM `sys_mechanism` WHERE loutype=#{id}
+ SELECT GROUP_CONCAT(mechanismName) as mechanismname FROM `sys_mechanism` WHERE loutype=#{id} and is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3