移除腾讯经纬度

This commit is contained in:
2022-10-24 16:54:54 +08:00
parent 2d2ebd3dab
commit 5393a68b32
9 changed files with 1 additions and 309 deletions
@@ -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<String, Double> map = GeocodeUtils.geoconvBaiduToGoogle(district.getLng2()/10000000000d, district.getLat2()/10000000000d);
@@ -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<String, Double> 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", "智能水平");
}
@@ -192,31 +192,6 @@
<input name="district.lat" type="text" id="dLat2" value="${district.lat!0}" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["lng3"]?? && markMap["lng3"]?is_number && markMap["lng3"] == 1>
<i class="lock" name="lng3"></i>
<#else>
<i class="unlock" name="lng3"></i>
</#if>
经度(腾讯)<font color="red">*</font></td>
<td>
<input name="district.lng3" type="text" value="${district.lng3!0}" />
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["la3t"]?? && markMap["lat3"]?is_number && markMap["lat3"] == 1>
<i class="lock" name="lat3"></i>
<#else>
<i class="unlock" name="lat3"></i>
</#if>
纬度(腾讯)<font color="red">*</font></td>
<td>
<input name="district.lat3" type="text" value="${district.lat3!0}" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["address"]?? && markMap["address"]?is_number && markMap["address"] == 1>
@@ -202,7 +202,6 @@
<label class="checkbox"><input type="checkbox" id="col31a" temp="31" rank="1" name="chkCol" f_name="calcType" <#if columnIds?index_of('col31a')!=-1>checked</#if>>计算方式</label>
<label class="checkbox"><input type="checkbox" id="col32a" temp="32" rank="1" name="chkCol" f_name="lng2_lat2" <#if columnIds?index_of('col32a')!=-1>checked</#if>>百度</label>
<label class="checkbox"><input type="checkbox" id="col33a" temp="33" rank="1" name="chkCol" f_name="lng_lat" <#if columnIds?index_of('col33a')!=-1>checked</#if>>高德</label>
<label class="checkbox"><input type="checkbox" id="col34a" temp="34" rank="1" name="chkCol" f_name="lng3_lat3" <#if columnIds?index_of('col34a')!=-1>checked</#if>>腾讯</label>
<label class="checkbox"><input type="checkbox" id="col35a" temp="35" rank="1" name="chkCol" f_name="districtSummary" <#if columnIds?index_of('col35a')!=-1>checked</#if>>小区备注</label>
<label class="checkbox"><input type="checkbox" id="col37a" temp="36" rank="1" name="chkCol" f_name="mappingAlias" <#if columnIds?index_of('col37a')!=-1>checked</#if>>映射别名</label>
<label class="checkbox"><input type="checkbox" id="col38a" temp="38" rank="1" name="chkCol" f_name="propertyLife" <#if columnIds?index_of('col38a')!=-1>checked</#if>>产权年限</label>
@@ -671,10 +670,7 @@
<td align="center" name="col33a" class="<#if columnIds?index_of('col33a')==-1>dn</#if>">
<#if district.lat??>${district.lng/10000000000},${district.lat/10000000000}</#if>
</td>
<td align="center" name="col34a" class="<#if columnIds?index_of('col34a')==-1>dn</#if>">
<#if district.lat3??>${district.lng3/10000000000},${district.lat3/10000000000}</#if>
</td>
<td align="center" name="col21a" class="<#if columnIds?index_of('col21a')==-1>dn</#if>">
<input class="cat" data-id="${district.id}" data-cat="office" data-name="${district.name!}" type="button" value="写字楼"/>
<input class="cat" data-id="${district.id}" data-cat="shop" data-name="${district.name!}" type="button" value="商铺"/>
@@ -89,23 +89,6 @@
<input name="district.lat" type="text" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
<td class = "t1">
经度(腾讯)<font color="red">*</font></td>
<td>
<input name="district.lng3" type="text" />
</td>
</tr>
<tr>
<td class = "t1">
纬度(腾讯)<font color="red">*</font></td>
<td>
<input name="district.lat3" type="text" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
<td class = "t1">地址<font color="red">*</font></td>
<td>
@@ -145,33 +145,6 @@
<input name="district.lat" type="text" value="${district.lat!0}" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["lng3"]?? && markMap["lng3"] == 1>
<i class="lock" name="lng3"></i>
<#else>
<i class="unlock" name="lng3"></i>
</#if>
经度(腾讯)<font color="red">*</font></td>
<td>
<input name="district.lng3" type="text" value="${district.lng3!0}" />
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["lat3"]?? && markMap["lat3"] == 1>
<i class="lock" name="lat3"></i>
<#else>
<i class="unlock" name="lat3"></i>
</#if>
纬度(腾讯)<font color="red">*</font></td>
<td>
<input name="district.lat3" type="text" value="${district.lat3!0}" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["address"]?? && markMap["address"] == 1>
@@ -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;
@@ -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<List<String>> 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)
}
}
})
@@ -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())) {