From 5393a68b32eadf660b91d878138bb4d8a201e1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Mon, 24 Oct 2022 16:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=85=BE=E8=AE=AF=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/District2Controller.java | 6 - .../bkoff/controllers/DistrictController.java | 14 -- .../src/main/webapp/district/edit.ftl | 25 --- .../src/main/webapp/district/list.ftl | 6 +- .../src/main/webapp/district2/addOffice.ftl | 17 -- .../src/main/webapp/district2/editOffice.ftl | 27 --- .../fangjia/dal/seaweed/model/District.java | 17 -- .../com/fangjia/script/wenyan/Test4.groovy | 187 ------------------ .../index/DistrictTriggerServiceImpl.java | 11 -- 9 files changed, 1 insertion(+), 309 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java index 2c8899d95..3d3ca01eb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java @@ -693,12 +693,6 @@ public class District2Controller { if (null != district.getLat2() && district.getLat2() > 0) { data.put("lat2", district.getLat2()); } - if (null != district.getLng3() && district.getLng3() > 0) { - data.put("lng3", district.getLng3()); - } - if (null != district.getLat3() && district.getLat3() > 0) { - data.put("lat3", district.getLat3()); - } if(district.getLat2()>0 && district.getLng2() >0){ Map map = GeocodeUtils.geoconvBaiduToGoogle(district.getLng2()/10000000000d, district.getLat2()/10000000000d); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index dd04da3dd..659fe43c9 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -2034,14 +2034,6 @@ public class DistrictController { if (null != district.getLat2() && district.getLat2() > 0) { data.put("lat2", district.getLat2()); } - // 新加腾讯地图 - if (null != district.getLng3() && district.getLng3() > 0) { - data.put("lng3", district.getLng3()); - } - if (null != district.getLat3() && district.getLat3() > 0) { - data.put("lat3", district.getLat3()); - } - if (district.getLat2() > 0 && district.getLng2() > 0) { Map map = GeocodeUtils.geoconvBaiduToGoogle(district.getLng2() / 10000000000d, @@ -2054,12 +2046,8 @@ public class DistrictController { district.setLat(lat); district.setLng(lng); } - district.setLat3(lat); - district.setLng3(lng); data.put("lat", district.getLat()); data.put("lng", district.getLng()); - data.put("lat3", district.getLat3()); - data.put("lng3", district.getLng3()); } data.put("name", district.getName()); @@ -3305,8 +3293,6 @@ public class DistrictController { put("lng2", "百度经度"); put("lat", "高德纬度"); put("lng", "高德经度"); - put("lat3", "腾讯纬度"); - put("lng3", "腾讯经度"); put("loopLineInfo", "环线位置"); put("intelligenceLevel", "智能水平"); } diff --git a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl index 62474bcc9..52454f04e 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl @@ -192,31 +192,6 @@ 娉細濉叆鏁存暟锛屽393422150000 - - - <#if markMap?? && markMap["lng3"]?? && markMap["lng3"]?is_number && markMap["lng3"] == 1> - - <#else> - - - 缁忓害(鑵捐)* - - - - - - - - <#if markMap?? && markMap["la3t"]?? && markMap["lat3"]?is_number && markMap["lat3"] == 1> - - <#else> - - - 绾害(鑵捐)* - - 娉細濉叆鏁存暟锛屽393422150000 - - <#if markMap?? && markMap["address"]?? && markMap["address"]?is_number && markMap["address"] == 1> diff --git a/projects/fangjia-bkoff/src/main/webapp/district/list.ftl b/projects/fangjia-bkoff/src/main/webapp/district/list.ftl index 60e42be0a..93466d73a 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/list.ftl @@ -202,7 +202,6 @@ - @@ -671,10 +670,7 @@ <#if district.lat??>${district.lng/10000000000}锛�${district.lat/10000000000} - - - <#if district.lat3??>${district.lng3/10000000000}锛�${district.lat3/10000000000} - + diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl index f250af3dc..207cd11ae 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl @@ -89,23 +89,6 @@ 娉細濉叆鏁存暟锛屽393422150000 - - - - - 缁忓害(鑵捐)* - - - - - - - - 绾害(鑵捐)* - - 娉細濉叆鏁存暟锛屽393422150000 - - 鍦板潃* diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl index e62a5cc71..8dd9ca8ee 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl @@ -145,33 +145,6 @@ 娉細濉叆鏁存暟锛屽393422150000 - - - - - <#if markMap?? && markMap["lng3"]?? && markMap["lng3"] == 1> - - <#else> - - - 缁忓害(鑵捐)* - - - - - - - <#if markMap?? && markMap["lat3"]?? && markMap["lat3"] == 1> - - <#else> - - - 绾害(鑵捐)* - - 娉細濉叆鏁存暟锛屽393422150000 - - - <#if markMap?? && markMap["address"]?? && markMap["address"] == 1> diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java index 32e526e32..e7c2195ef 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java @@ -65,8 +65,6 @@ public class District implements SeaweedEntity { private Long lng; private Long lat2;//百度 private Long lng2; - private Long lat3;//腾讯 - private Long lng3; private String developer; private String estateCompany; private String allArea; @@ -1075,21 +1073,6 @@ public class District implements SeaweedEntity { this.lng2 = lng2; } - public void setLat3(Long lat3) { - this.lat3 = lat3; - } - @Column(name = "lat3") - public Long getLat3() { - return lat3; - } - public void setLng3(Long lng3) { - this.lng3 = lng3; - } - @Column(name = "lng3") - public Long getLng3() { - return lng3; - } - @Column(name = "finish_building_date") public String getFinishBuildingDate() { return finishBuildingDate; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy index 96febc0f6..09877e434 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy @@ -1,188 +1 @@ package com.fangjia.script.wenyan - -//ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Downloads\\国信达级联价格-上海.xlsx",{List item-> -// if(item["AB"]){ -// return -// } -// String region = null -// String name = item["F"] -// if(name.endsWith("小区")){ -// name = name.replaceAll("小区\$", "") -// } -// region = RegionData.formatRegion(item["B"], item["D"]) -// def results = [] -// DbUtils.seaweed.find(DbUtils.buildSeaweedQuery(item["B"], region, name)).each { -// if(!results.contains(it)){ -// results.add(it) -// } -// } -// DbUtils.seaweed.find(DbUtils.buildSeaweedQuery(item["B"], region).append("alias", name)).each { -// if(!results.contains(it)){ -// results.add(it) -// } -// } -// if(results.size() == 1){ -// item["Z"] = results[0]._id.toString() -// item["AA"] = results[0].region -// item["AB"] = results[0].name -// println(item) -// } -//}) - - - - -import com.fangjia.core.ProvinceData -import com.fangjia.core.RegionData -import com.fangjia.script.util.CommonUtils -import com.fangjia.script.util.DataUtil -import com.fangjia.script.util.DbUtils -import com.fangjia.script.util.ElasticUtils -import com.fangjia.script.util.ExcelUtils -import com.fangjia.script.util.MongoUtils -import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils -import com.mongodb.BasicDBObject -import com.mongodb.DBCollection -import net.sf.json.JSONObject -import org.apache.commons.lang.StringUtils -import org.elasticsearch.index.query.BoolQueryBuilder -import org.elasticsearch.index.query.QueryBuilders - -//DBCollection SEAWEED_TOWNSHIP = MongoUtils.getCollectionByName("fangjia_base", "seaweed_township", "192.168.0.235", 27018) -//def count = 0 -//List> data = Collections.synchronizedList([]) -//data << ["ID","城市","区域","小区名","经度","纬度","街道"] -// -//CommonUtils.findAllCity().each {def city-> -// DbUtils.multiThreadingExecuteQueryOnSeaweed(DbUtils.buildSeaweedQuery(city),{BasicDBObject item-> -// if(StringUtils.isBlank(item.township) && item.lng){ -// count++ -// def lng = item.lng/10000000000d -// def lat = item.lat/10000000000d -// def location = "${lng},${lat}" -// JSONObject resp = GaoDeApiUtils.geocode(location) -// def row = [] -// row << item._id.toString() -// row << item.city -// row << item.region -// row << item.name -// row << lng -// row << lat -// BasicDBObject dbo = new BasicDBObject() -// dbo.id = item._id.toString() -// dbo.city = item.city -// dbo.region = item.region -// dbo.name = item.name -// dbo.lng = lng -// dbo.lat = lat -// if(resp.regeocode && resp.regeocode.addressComponent && resp.regeocode.addressComponent.township){ -// row << resp.regeocode.addressComponent.township -// dbo.township = resp.regeocode.addressComponent.township -// } -// println(row) -// data << row -// SEAWEED_TOWNSHIP.insert(dbo) -// } -// }) -//} -//ExcelUtils.write("D:\\街道补充数据.xlsx", data, "补充数据") - -//ExcelUtils.modify("D:\\街道补充数据.xlsx",{List item -> -// if(item["G"] && item["H"] == null){ -// DbUtils.seaweed.update(new BasicDBObject("_id", item["A"]), new BasicDBObject('$set', new BasicDBObject('township', item["G"]))) -// } -// println(item) -//}) - -//ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Downloads\\错误经纬度.xlsx",{List item-> -// def location = "${item["A"]},${item["B"]}" -// JSONObject resp = GaoDeApiUtils.geocode(location) -// if(resp.regeocode && resp.regeocode.formatted_address){ -// item['G'] = resp.regeocode.formatted_address -// println(item) -// } -//}) - -//def count = 0 -//CommonUtils.findAllCity().each {def city-> -// DbUtils.executeQueryOnSeaweed(DbUtils.buildSeaweedQuery(city),{BasicDBObject item-> -// if(item.township){ -// count++ -// } -// }, new BasicDBObject("township", 1)) -//} -//println(count) -//def GXD_CCB = [:] -//def CCB_FJW = [:] -//ExcelUtils.read("D:\\Users\\wenyan\\Downloads\\4月级联待优化小区_3个城市.xlsx",sheetIndex = 1).each {List item-> -// if(item["V"] == "级联"){ -// if(item["Y"] == "国信达"){ -// GXD_CCB[item['J']] = item["E"] -// }else if(item["Y"] == "房价网"){ -// CCB_FJW[item['E']] = item["J"] -// } -// } -//} -//ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Downloads\\4月级联待优化小区_3个城市.xlsx",{List item-> -// if(item["V"] == "级联" && item["Y"] == "国信达"){ -// def ccbId = GXD_CCB.get(item['J'], null) -// def fjwId = CCB_FJW.get(ccbId, null) -// if(fjwId != null){ -// item["AB"] = fjwId -//// BasicDBObject seaweed = DbUtils.seaweed.findById(fjwId) -//// List results = DbUtils.findAroundDistrict(seaweed) -//// long total = 0 -//// long count = 0 -//// for(BasicDBObject s : results){ -//// def avg = DbUtils.findDistrictAveragePrice(seaweed.city, seaweed.region, seaweed.name, Date.parse('yyyyMMdd', '20220619'), seaweed.estate_type2) -//// if(avg){ -//// total += avg.avg_price -//// count += 1 -//// } -//// } -//// if(count > 0){ -//// item['Z'] = (int)(total/count) -//// println(item) -//// } -// } -// } -//},sheetIndex = 1) - -ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\小区字段补充.xlsx",{List item-> - BasicDBObject seaweed = DbUtils.seaweed.findById(item["A"]) - if(StringUtils.isBlank(seaweed.create_year)){ - def names = [] - names.add(seaweed.name) - if(seaweed.alias){ - for(def it in seaweed.alias){ - if(StringUtils.isNotBlank(it) && !names.contains(it)){ - names.add(it) - } - } - } - BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery() - boolQueryBuilder.must(QueryBuilders.termQuery("city", seaweed.city)) - boolQueryBuilder.must(QueryBuilders.termQuery("region", seaweed.region)) - boolQueryBuilder.must(QueryBuilders.termsQuery("name", names)); - item["B"] = seaweed.city - item["C"] = seaweed.region - item["D"] = seaweed.name - List result = ElasticUtils.executeSimpleQuery("192.168.0.206", "community", boolQueryBuilder) - def buildYears = [] - result.each { - if(StringUtils.isNotBlank(it.build_year) && !StringUtils.containsAny(it.build_year,"无")){ - String build_year = it.build_year - build_year = build_year.replaceAll("((|\\().*()|\\))", "") - build_year = build_year.replaceAll("[年建]", "") -// property_fee = property_fee.replace("元/㎡·月", "元/平米/月") - buildYears.add(build_year) - } - } - buildYears = buildYears.unique() - if(buildYears.size() > 0){ - DbUtils.seaweed.update(new BasicDBObject("_id", seaweed._id), new BasicDBObject('$set', new BasicDBObject('create_year', buildYears[0]))) - println(item) - println(buildYears) - } - } -}) \ No newline at end of file diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java index 4cb2c5cf2..8d4022ed3 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/index/DistrictTriggerServiceImpl.java @@ -87,8 +87,6 @@ public class DistrictTriggerServiceImpl implements TriggerService { newObj.put("lng", object.get("lng")); newObj.put("lat2", object.get("lat2")); newObj.put("lng2", object.get("lng2")); - newObj.put("lat3", object.get("lat3")); - newObj.put("lng3", object.get("lng3")); newObj.put("estate_type", object.get("estate_type")); newObj.put("estate_type2", object.get("estate_type2")); newObj.put("build_type", object.get("build_type")); @@ -138,15 +136,6 @@ public class DistrictTriggerServiceImpl implements TriggerService { newObj.put("lat_lng", lat + "," + lng); } } - -// if (null != object.get("lat3") && null != object.get("lng3")) { -// double lat3 = (double)((Long)object.get("lat3") / 10000000000.0); -// double lng3 = (double)((Long)object.get("lng3") / 10000000000.0); -// if (lat3 >= -90 && lat3 <= 90 && lng3 >= -180 && lng3 <= 180) { -// newObj.put("lat_lng3", lat3 + "," + lng3); -// } -// } - if (object.get("kind") != null) { String[] kinds = ((String) object.get("kind")).split(","); if (ArrayUtils.contains(kinds, DistrictKindEnum.bieshu.getValue())) {