From d769a8683ea6f2ecbc451da71ca3079c6765a99d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 13:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 51 +++------------------------------------------------
1 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
index f57b93e..ebde9cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -112,12 +112,10 @@
if (comActDO != null){
vo.setAddress(comActDO.getAddress());
vo.setPhone(comActDO.getContactsPhone());
+ vo.setLon(comActDO.getLng());
+ vo.setLat(comActDO.getLat());
}
-// List<String> list = getCoordinate(vo.getAddress());
-// if (list !=null && list.size() > 0){
-// vo.setLon(list.get(0));
-// vo.setLat(list.get(1));
-// }
+
List<ComActWorkGuideMaterialDO> workGuideMaterialDOS = workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
.eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
@@ -153,47 +151,4 @@
.eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
return R.ok();
}
-
-// // 调用百度地图API根据地址，获取坐标
-// public static List<String> getCoordinate(String address) {
-// List<String> list = new ArrayList<>();
-// if (address != null && !"".equals(address)) {
-// address = address.replaceAll("\\s*", "").replace("#", "栋");
-// String url = "http://api.map.baidu.com/geocoder/v3/?address=" + address + "&output=json&ak=" + AK;
-// String json = loadJSON(url);
-//// json = "{" + json;
-//// json = json + "}";
-// if (json != null && !"".equals(json)) {
-// XMLSerializer xmlSerializer = new XMLSerializer();
-// //将xml转为json（注：如果是元素的属性，会在json里的key前加一个@标识）
-// String result = xmlSerializer.read(json).toString();
-// JSONObject obj = JSONObject.parseObject(json);
-// if ("0".equals(obj.getString("status"))) {
-// double lng = obj.getJSONObject("result").getJSONObject("location").getDouble("lng"); // 经度
-// double lat = obj.getJSONObject("result").getJSONObject("location").getDouble("lat"); // 纬度
-// DecimalFormat df = new DecimalFormat("#.######");
-// list.add(df.format(lng));
-// list.add(df.format(lat));
-// return list;
-// }
-// }
-// }
-// return null;
-// }
-//
-// public static String loadJSON(String url) {
-// StringBuilder json = new StringBuilder();
-// try {
-// URL oracle = new URL(url);
-// URLConnection yc = oracle.openConnection();
-// BufferedReader in = new BufferedReader(new InputStreamReader(yc.getInputStream(), "UTF-8"));
-// String inputLine = null;
-// while ((inputLine = in.readLine()) != null) {
-// json.append(inputLine);
-// }
-// in.close();
-// } catch (MalformedURLException e) {} catch (IOException e) {}
-// return json.toString();
-// }
-
}
--
Gitblit v1.7.1