From d79aeb1aefbeff017c27304750f62d629779ed0b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Sep 2022 08:46:57 +0800
Subject: [PATCH] 修改返回信息
---
src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java | 4 +++-
src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java | 4 +++-
src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml | 2 +-
src/main/java/org/springblade/modules/life/controller/LifeController.java | 2 +-
src/main/java/org/springblade/modules/tagging/controller/TaggingController.java | 5 +++--
5 files changed, 11 insertions(+), 6 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 c412517..a94bc32 100644
--- a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
+++ b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
@@ -116,7 +116,7 @@
architecture.setRoll("0");
architecture.setGd("0");
//String url = "http://192.168.0.115:8080/#/mobileLayout/default";
- String url = "http://171.34.197.243:786/#/mobileLayout/default";
+ String url = "https://dev.jxpskj.com:8023/zhjg/#/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");
@@ -141,6 +141,7 @@
websiteurl = URLEncoder.encode(architecture.getWebsiteurl(), "UTF-8");
}
String type = URLEncoder.encode(architecture.getType(), "UTF-8");
+ String x = URLEncoder.encode(architecture.getX(), "UTF-8");
String xtype = URLEncoder.encode(architecture.getCampus(), "UTF-8");
String heading = URLEncoder.encode(architecture.getHeading(), "UTF-8");
String pitch = URLEncoder.encode(architecture.getPitch(), "UTF-8");
@@ -157,6 +158,7 @@
"&telephone=" + telephone +
"&introduce=" + introduce +
"&jd=" + jd +
+ "&x=" + x +
"&wd=" + wd +
"&gd=" + gd +
"&tpurl=" + tpurl +
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 d57503d..14ee534 100644
--- a/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
+++ b/src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml
@@ -42,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}
diff --git a/src/main/java/org/springblade/modules/life/controller/LifeController.java b/src/main/java/org/springblade/modules/life/controller/LifeController.java
index 2633068..87e76c4 100644
--- a/src/main/java/org/springblade/modules/life/controller/LifeController.java
+++ b/src/main/java/org/springblade/modules/life/controller/LifeController.java
@@ -100,7 +100,7 @@
life.setRoll("0");
life.setGd("0");
// String url = "http://192.168.0.115:8080/#/mobileLayout/default";
-// //String url = "http://171.34.197.243:786/#/mobileLayout/default";
+// //String url = "https://dev.jxpskj.com:8023/zhjg/#/mobileLayout/default";
// String gotos = URLEncoder.encode("arc", "UTF-8");
// String mechanismname = URLEncoder.encode(life.getMechanismname(), "UTF-8");
// String address = null;
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 d70ab64..2a8743f 100644
--- a/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
+++ b/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
@@ -104,13 +104,14 @@
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 url = "https://dev.jxpskj.com:8023/zhjg/#/mobileLayout/default";
String gotos = URLEncoder.encode("arc", "UTF-8");
String mechanismname = URLEncoder.encode(mechanism.getMechanismname(), "UTF-8");
String address = URLEncoder.encode(mechanism.getAddress(), "UTF-8");
String telephone = URLEncoder.encode(mechanism.getTelephone(), "UTF-8");
String introduce = URLEncoder.encode(mechanism.getIntroduce(), "UTF-8");
String jd = URLEncoder.encode(mechanism.getJd(), "UTF-8");
+ String x = URLEncoder.encode(mechanism.getX(), "UTF-8");
String wd = URLEncoder.encode(mechanism.getWd(), "UTF-8");
String gd = URLEncoder.encode(mechanism.getGd(), "UTF-8");
String tpurl = URLEncoder.encode(mechanism.getTpurl(), "UTF-8");
@@ -127,6 +128,7 @@
"&telephone=" + telephone +
"&introduce=" + introduce +
"&jd=" + jd +
+ "&x=" + x +
"&wd=" + wd +
"&gd=" + gd +
"&tpurl=" + tpurl +
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 5805f81..04ef437 100644
--- a/src/main/java/org/springblade/modules/tagging/controller/TaggingController.java
+++ b/src/main/java/org/springblade/modules/tagging/controller/TaggingController.java
@@ -107,7 +107,7 @@
String urlz = locaPath;
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 url = "https://dev.jxpskj.com:8023/zhjg/#/mobileLayout/default";
String addressName = URLEncoder.encode(tagging.getAddressName(), "UTF-8");
// JsonObject lan1 = new JsonObject();
// lan1.addProperty("methods", URLEncoder.encode("goto", "UTF-8"));
@@ -116,9 +116,10 @@
// lan1.addProperty("name", URLEncoder.encode(tagging.getName(), "UTF-8"));
String gotos = URLEncoder.encode("goto","UTF-8");
String jd = URLEncoder.encode(tagging.getJd(),"UTF-8");
+ String x = URLEncoder.encode(tagging.getX(),"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 +"&addressName=" + addressName ;
+ String content = url + "?methods=" + gotos+"&jd="+jd+"&x="+x+"&wd="+wd+"&name="+name +"&addressName=" + addressName ;
//生成标注二维码
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
String encode = new BASE64Encoder().encode(qrCodeImage);
--
Gitblit v1.9.3