From 04ba725c9fac626ef0f02435ec8243321a15725c Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Tue, 22 Mar 2022 09:32:38 +0800
Subject: [PATCH] +所有页面添加地址详细名称字段
---
src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java | 2 +
src/main/java/org/springblade/modules/tagging/entity/Tagging.java | 5 ++
src/main/java/org/springblade/modules/sp/entity/Sp.java | 5 ++
src/main/java/org/springblade/modules/vr/entity/Vr.java | 5 ++
src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml | 1
src/main/java/org/springblade/modules/road/mapper/RoadMapper.xml | 1
src/main/java/org/springblade/modules/architecture/entity/Architecture.java | 5 ++
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 4 +
src/main/java/org/springblade/modules/life/entity/Life.java | 5 ++
src/main/java/org/springblade/modules/road/entity/Road.java | 31 +++++++++------
src/main/resources/application-test.yml | 7 ++-
src/main/java/org/springblade/modules/mechanism/entity/Mechanism.java | 5 ++
src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml | 1
src/main/java/org/springblade/modules/vr/mapper/VrMapper.xml | 3 +
src/main/java/org/springblade/modules/tagging/mapper/TaggingMapper.xml | 1
src/main/java/org/springblade/modules/sp/mapper/SpMapper.xml | 1
src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java | 7 ++-
src/main/java/org/springblade/modules/tagging/controller/TaggingController.java | 3 +
18 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
index 3e05956..982530c 100644
--- a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
+++ b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
@@ -118,14 +118,15 @@
String url = "http://192.168.0.115:8080/#/mobileLayout/default";
//String url = "http://171.34.197.243:786/#/mobileLayout/default";
String gotos = URLEncoder.encode("arc", "UTF-8");
+ String addressName = URLEncoder.encode(architecture.getAddressName(), "UTF-8");
String mechanismname = URLEncoder.encode(architecture.getMechanismname(), "UTF-8");
String address = null;
if (architecture.getAddress() != null) {
address = URLEncoder.encode(architecture.getAddress(), "UTF-8");
}
- String telephone=null;
+ String telephone = null;
if (architecture.getTelephone() != null) {
- telephone = URLEncoder.encode(architecture.getTelephone(), "UTF-8");
+ telephone = URLEncoder.encode(architecture.getTelephone(), "UTF-8");
}
String introduce = URLEncoder.encode(architecture.getIntroduce(), "UTF-8");
String jd = URLEncoder.encode(architecture.getJd(), "UTF-8");
@@ -165,7 +166,7 @@
"&heading=" + heading +
"&pitch=" + pitch +
"&roll=" + roll +
- "&panoramaurl=" + panoramaurl +
+ "&panoramaurl=" + panoramaurl + "&addressName=" + addressName +
"&videourl=" + videourl;
//生成标注二维码
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
diff --git a/src/main/java/org/springblade/modules/architecture/entity/Architecture.java b/src/main/java/org/springblade/modules/architecture/entity/Architecture.java
index 01056cf..1e11eea 100644
--- a/src/main/java/org/springblade/modules/architecture/entity/Architecture.java
+++ b/src/main/java/org/springblade/modules/architecture/entity/Architecture.java
@@ -131,6 +131,11 @@
*/
@ApiModelProperty(value = "视频地址")
private String videourl;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
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..08aebb1 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="addressName" property="addressName"/>
</resultMap>
@@ -66,7 +67,8 @@
heading,
pitch,
roll,
- panoramaurl
+ panoramaurl,
+ addressName
FROM `sys_architecture`
WHERE id = #{id}
and is_deleted = 0
diff --git a/src/main/java/org/springblade/modules/life/entity/Life.java b/src/main/java/org/springblade/modules/life/entity/Life.java
index 0d62c8f..7ad88d9 100644
--- a/src/main/java/org/springblade/modules/life/entity/Life.java
+++ b/src/main/java/org/springblade/modules/life/entity/Life.java
@@ -173,5 +173,10 @@
*/
@ApiModelProperty(value = "视频地址")
private String videourl;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
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 6c41c6a..995d3eb 100644
--- a/src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml
+++ b/src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml
@@ -28,6 +28,7 @@
<result column="roll" property="roll"/>
<result column="loutype" property="loutype"/>
<result column="mtype" property="mtype"/>
+ <result column="addressName" property="addressName"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java b/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
index 0299599..2e52734 100644
--- a/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
+++ b/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
@@ -102,6 +102,7 @@
mechanism.setHeading("0");
mechanism.setRoll("0");
mechanism.setGd("0");
+ String addressName = URLEncoder.encode(mechanism.getAddressName(), "UTF-8");
String url = "http://192.168.0.115:8080/#/mobileLayout/default";
//String url = "http://171.34.197.243:786/#/mobileLayout/default";
String gotos = URLEncoder.encode("arc", "UTF-8");
@@ -137,6 +138,7 @@
"&heading=" + heading +
"&pitch=" + pitch +
"&roll=" + roll +
+ "&addressName=" + addressName +
"&videourl=" + videourl;
//生成标注二维码
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
diff --git a/src/main/java/org/springblade/modules/mechanism/entity/Mechanism.java b/src/main/java/org/springblade/modules/mechanism/entity/Mechanism.java
index bfd2177..73805cd 100644
--- a/src/main/java/org/springblade/modules/mechanism/entity/Mechanism.java
+++ b/src/main/java/org/springblade/modules/mechanism/entity/Mechanism.java
@@ -138,5 +138,10 @@
*/
@ApiModelProperty(value = "视频地址")
private String videourl;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
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 01d9ae3..d040e21 100644
--- a/src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml
+++ b/src/main/java/org/springblade/modules/mechanism/mapper/MechanismMapper.xml
@@ -16,6 +16,7 @@
<result column="codeUrl" property="codeurl"/>
<result column="websiteUrl" property="websiteurl"/>
<result column="type" property="type"/>
+ <result column="addressName" property="addressName"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/road/entity/Road.java b/src/main/java/org/springblade/modules/road/entity/Road.java
index 757723d..48bc687 100644
--- a/src/main/java/org/springblade/modules/road/entity/Road.java
+++ b/src/main/java/org/springblade/modules/road/entity/Road.java
@@ -18,7 +18,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
@@ -39,21 +41,26 @@
private Long id;
/**
- * 名称
- */
- @ApiModelProperty(value = "名称")
- @TableField("roadName")
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ @TableField("roadName")
private String roadname;
/**
- * 经度
- */
- @ApiModelProperty(value = "经度")
- private String jd;
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String jd;
/**
- * 纬度
- */
- @ApiModelProperty(value = "纬度")
- private String wd;
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String wd;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
diff --git a/src/main/java/org/springblade/modules/road/mapper/RoadMapper.xml b/src/main/java/org/springblade/modules/road/mapper/RoadMapper.xml
index 4cad73f..372cd8b 100644
--- a/src/main/java/org/springblade/modules/road/mapper/RoadMapper.xml
+++ b/src/main/java/org/springblade/modules/road/mapper/RoadMapper.xml
@@ -8,6 +8,7 @@
<result column="roadName" property="roadname"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="addressName" property="addressName"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/sp/entity/Sp.java b/src/main/java/org/springblade/modules/sp/entity/Sp.java
index de8cb54..27cb83f 100644
--- a/src/main/java/org/springblade/modules/sp/entity/Sp.java
+++ b/src/main/java/org/springblade/modules/sp/entity/Sp.java
@@ -55,6 +55,11 @@
private String vrurl;
private String jd;
private String wd;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
diff --git a/src/main/java/org/springblade/modules/sp/mapper/SpMapper.xml b/src/main/java/org/springblade/modules/sp/mapper/SpMapper.xml
index 8363acf..ee94742 100644
--- a/src/main/java/org/springblade/modules/sp/mapper/SpMapper.xml
+++ b/src/main/java/org/springblade/modules/sp/mapper/SpMapper.xml
@@ -9,6 +9,7 @@
<result column="VrUrl" property="vrurl"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="addressName" property="addressName"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/tagging/controller/TaggingController.java b/src/main/java/org/springblade/modules/tagging/controller/TaggingController.java
index 399e954..5805f81 100644
--- a/src/main/java/org/springblade/modules/tagging/controller/TaggingController.java
+++ b/src/main/java/org/springblade/modules/tagging/controller/TaggingController.java
@@ -108,6 +108,7 @@
System.out.println(urlz);
//String url = "http://192.168.0.115:8080/#/mobileLayout/default";
String url = "http://171.34.197.243:786/#/mobileLayout/default";
+ String addressName = URLEncoder.encode(tagging.getAddressName(), "UTF-8");
// JsonObject lan1 = new JsonObject();
// lan1.addProperty("methods", URLEncoder.encode("goto", "UTF-8"));
// lan1.addProperty("jd", URLEncoder.encode(tagging.getJd(), "UTF-8"));
@@ -117,7 +118,7 @@
String jd = URLEncoder.encode(tagging.getJd(),"UTF-8");
String wd = URLEncoder.encode(tagging.getWd(),"UTF-8");
String name = URLEncoder.encode(tagging.getName(),"UTF-8");
- String content = url + "?methods=" + gotos+"&jd="+jd+"&wd="+wd+"&name="+name;
+ String content = url + "?methods=" + gotos+"&jd="+jd+"&wd="+wd+"&name="+name +"&addressName=" + addressName ;
//生成标注二维码
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
String encode = new BASE64Encoder().encode(qrCodeImage);
diff --git a/src/main/java/org/springblade/modules/tagging/entity/Tagging.java b/src/main/java/org/springblade/modules/tagging/entity/Tagging.java
index 1ec144d..673f19e 100644
--- a/src/main/java/org/springblade/modules/tagging/entity/Tagging.java
+++ b/src/main/java/org/springblade/modules/tagging/entity/Tagging.java
@@ -47,6 +47,11 @@
@ColumnWidth(16)
@ExcelProperty("二维码图片")
private String qrcode;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
diff --git a/src/main/java/org/springblade/modules/tagging/mapper/TaggingMapper.xml b/src/main/java/org/springblade/modules/tagging/mapper/TaggingMapper.xml
index 5dc4be3..852d735 100644
--- a/src/main/java/org/springblade/modules/tagging/mapper/TaggingMapper.xml
+++ b/src/main/java/org/springblade/modules/tagging/mapper/TaggingMapper.xml
@@ -8,6 +8,7 @@
<result column="name" property="name"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="addressName" property="addressName"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/vr/entity/Vr.java b/src/main/java/org/springblade/modules/vr/entity/Vr.java
index 1e214e5..16d50b4 100644
--- a/src/main/java/org/springblade/modules/vr/entity/Vr.java
+++ b/src/main/java/org/springblade/modules/vr/entity/Vr.java
@@ -55,6 +55,11 @@
private String vrurl;
private String jd;
private String wd;
+ /**
+ * 选点逆解析返回的地址名字
+ */
+ @ApiModelProperty(value = "选点逆解析返回的地址名字")
+ private String addressName;
}
diff --git a/src/main/java/org/springblade/modules/vr/mapper/VrMapper.xml b/src/main/java/org/springblade/modules/vr/mapper/VrMapper.xml
index 1b589d4..f100236 100644
--- a/src/main/java/org/springblade/modules/vr/mapper/VrMapper.xml
+++ b/src/main/java/org/springblade/modules/vr/mapper/VrMapper.xml
@@ -7,6 +7,9 @@
<id column="id" property="id"/>
<result column="VrName" property="vrname"/>
<result column="VrUrl" property="vrurl"/>
+ <result column="jd" property="jd"/>
+ <result column="wd" property="wd"/>
+ <result column="addressName" property="addressName"/>
</resultMap>
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index fab7885..4cd30ea 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -14,9 +14,12 @@
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
- url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+# username: root
+# password: root
+ url: jdbc:mysql://localhost:3306/zhxyys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: root
+ password: 245436
#第三方登陆
social:
--
Gitblit v1.9.3