From c82acdcd2caca0e9b78bf2af798c3a27e131c2c9 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Tue, 22 Nov 2022 15:15:24 +0800
Subject: [PATCH] 上次读取数据库连接配置
---
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 8b9d722..dcafa8a 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -21,6 +21,7 @@
<result column="pitch" property="pitch"/>
<result column="roll" property="roll"/>
<result column="panoramaurl" property="panoramaurl"/>
+ <result column="address_name" property="addressName"/>
</resultMap>
@@ -41,7 +42,7 @@
<!--查询校内建筑列表-->
<select id="selectList" resultType="java.util.HashMap">
- SELECT id, mechanismName as mechanismname, tpUrl as tpurl
+ SELECT *
FROM `sys_architecture`
WHERE campus = #{campus}
and type = #{type}
@@ -66,7 +67,9 @@
heading,
pitch,
roll,
- panoramaurl
+ panoramaurl,
+ address_name,
+ x
FROM `sys_architecture`
WHERE id = #{id}
and is_deleted = 0
@@ -79,14 +82,15 @@
WHERE panoramaurl IS NOT NULL
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
+
+ <select id="selectArchALL" resultType="org.springblade.modules.architecture.entity.Architecture">
+ SELECT id,jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl,x
FROM sys_architecture
WHERE is_deleted = 0
- UNION
- SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
- FROM sys_mechanism
- WHERE is_deleted = 0
+ -- UNION
+-- SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
+-- FROM sys_mechanism
+-- WHERE is_deleted = 0
</select>
<select id="selectIns" resultType="java.lang.String">
@@ -144,6 +148,8 @@
introduce,
jd,
wd,
+ x,
+ y,
gd,
tpUrl as tpurl,
codeUrl as codeurl,
@@ -162,6 +168,8 @@
introduce,
jd,
wd,
+ x,
+ y,
gd,
tpUrl as tpurl,
codeUrl as codeurl,
@@ -180,6 +188,8 @@
introduce,
jd,
wd,
+ x,
+ y,
gd,
tpUrl as tpurl,
codeUrl as codeurl,
--
Gitblit v1.9.3