diff --git a/deliverables/geluke/pom.xml b/deliverables/geluke/pom.xml index 8d4554eac..6e3fc3c85 100644 --- a/deliverables/geluke/pom.xml +++ b/deliverables/geluke/pom.xml @@ -19,6 +19,7 @@ ../../projects/fangjia-core ../../projects/fangjia-dal + ../../projects/chafangtong-dal ../../projects/fangjia-service ../../projects/geluke-dal ../../projects/geluke-service diff --git a/deliverables/k8s/geluke.yaml b/deliverables/k8s/geluke.yaml new file mode 100644 index 000000000..93c1e1f10 --- /dev/null +++ b/deliverables/k8s/geluke.yaml @@ -0,0 +1,95 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: geluke + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: geluke + app: fangjia + template: + metadata: + labels: + project: geluke + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: geluke + image: 192.168.0.19:9012/geluke:latest + imagePullPolicy: Always + resources: + limits: + memory: "3Gi" + requests: + memory: "2Gi" + env: + - name: JAVA_OPTS + value: "-Xmx3072m -XX:MaxPermSize=256m + -Dlog4j.configuration=file:/home/goojia/webapps/ROOT/WEB-INF/classes/log4j_linux.xml + -Dfangjia.overridePropertiesLocation=/home/goojia/goojiaconfig/geluke.properties" + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 10 + periodSeconds: 10 + livenessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 10 + periodSeconds: 5 + ports: + - containerPort: 8080 + name: web + protocol: TCP + volumeMounts: + - name: host-time + mountPath: /etc/localtime + - name: goojiaconfig + mountPath: /home/goojia/goojiaconfig + + volumes: + - name: host-time + hostPath: + path: /etc/localtime + - name: goojiaconfig + cephfs: + monitors: + - 192.168.0.208:6789 + - 192.168.0.209:6789 + - 192.168.0.210:6789 + user: admin + path: /k8s/goojiaconfig + secretRef: + name: ceph-secret + readOnly: false + +--- +apiVersion: v1 +kind: Service +metadata: + name: geluke + namespace: fangjia + labels: + project: geluke + app: fangjia +spec: + type: NodePort + selector: + project: geluke + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30010 \ No newline at end of file diff --git a/deliverables/script/test/src/Test.java b/deliverables/script/test/src/Test.java deleted file mode 100644 index 9d88b45cf..000000000 --- a/deliverables/script/test/src/Test.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Created by Administrator on 2017/5/9. - */ -import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader; -import com.sun.xml.internal.txw2.Document; -import sun.nio.cs.ext.GB18030; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -public class Test { - String fixture_Date = null; - String area = null; - String unit_Price = null; - String transaction_Price = null; - static String sendGet(String url) { - String result = ""; - // 定义一个缓冲字符输入流 - BufferedReader in = null; - try { - // 将string转成url对象 - URL realUrl = new URL(url); - // 初始化一个链接到那个url的连接 - URLConnection connection = realUrl.openConnection(); - // 开始实际的连接 - connection.connect(); - // 初始化 BufferedReader输入流来读取URL的响应 - in = new BufferedReader(new InputStreamReader(connection.getInputStream(),"gbk")); - // 用来临时存储抓取到的每一行的数据 - String line; - while ((line = in.readLine()) != null) - { // 遍历抓取到的每一行并将其存储到result里面 - result += line; - } - Document document = Jsoup.parse(result, url); - - parseListPage(document); - - - } catch (Exception e) { - System.out.println("发送GET请求出现异常!" + e); - e.printStackTrace(); } - // 使用finally来关闭输入流 - finally { - try { - if (in != null) { - in.close(); } - } catch (Exception e2) { - e2.printStackTrace(); - } - } - return result; - } - public static void main(String[] args) { - // 定义即将访问的链接 - String url = "http://dl.goufang.com/xq/1062/6"; - // 访问链接并获取页面内容 - String result = sendGet(url); - System.out.println(result); - } -} - diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index de82fe219..c9973367c 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -1705,6 +1705,25 @@ public class AddressController { return mav; } + public Object addressSimilarityAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { + mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空")); + return mav; + } + model.setAddress(model.getAddress_1()); + String result1 = addressMatchProxyService.standard(convertModelToMap(model)); + model.setAddress(model.getAddress_2()); + String result2 = addressMatchProxyService.standard(convertModelToMap(model)); + if (result1 != null && result2 != null) { + Map resultMap = addressService.addressSimilarity(result1, result2); + mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + public Object parseCityAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getProvince())) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 5f3343578..93172390a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -131,7 +131,7 @@ import com.google.common.collect.Sets; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; -//@Authority(role = Role.USER) +@Authority(role = Role.USER) public class PropertyController { private static final Logger LOGGER = LoggerFactory.getLogger(PropertyController.class); @@ -4966,6 +4966,7 @@ public class PropertyController { * @throws NumberFormatException * @throws IllegalAccessException */ + @Authority(role = Role.NONE) public Object rentReportAction(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); @@ -5164,7 +5165,6 @@ public class PropertyController { } - public Object evaluateRentAction(PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException { RestfulModelAndView mav = new RestfulModelAndView(); mav.setViewType("rest"); @@ -5255,13 +5255,6 @@ public class PropertyController { } - - - - - - - public void setHouseLoudongService(HouseLoudongService houseLoudongService) { this.houseLoudongService = houseLoudongService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index 3d362bbb9..e1048387a 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -19,7 +19,24 @@ public class AddesssMatchModel extends FangjiaApiModel { private String province; private String debugName; private boolean useMap; + private String address_1; + private String address_2; + public String getAddress_1() { + return address_1; + } + + public void setAddress_1(String address_1) { + this.address_1 = address_1; + } + + public String getAddress_2() { + return address_2; + } + + public void setAddress_2(String address_2) { + this.address_2 = address_2; + } public boolean isContainsLocation() { return containsLocation; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy index 651c42cbb..59365a6a6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/index/AutocompleteDataUpdaterBatch.groovy @@ -18,8 +18,7 @@ import org.apache.commons.lang.StringUtils class AutocompleteDataUpdaterBatch extends BaseBatch { - - private static final DBCollection AC_COLL = MongoUtils.getCollectionByName("fangjia", "autocomplete", "192.168.0.51", 29009) + private static final DBCollection AC_COLL = MongoUtils.getCollectionByName("fangjia", "autocomplete", "mongo.db.fangjia.com") private static final DSCollection SEAWEED_COLL = new DataStore("seaweed.db.fangjia.com", 27007).getCollection("fangjia.seaweed") private static final DSCollection AUTOCOMPLETE_COLL = new DataStore("192.168.0.38", 27008).getCollection("fangjia.autocomplete") private static final long C_DATE = DateUtil.formatToYYYYMMDDhhmmss(new Date()).toLong() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/ScriptFour.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/ScriptFour.groovy index 807fb6c36..2c873d35b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/ScriptFour.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/ScriptFour.groovy @@ -1,2559 +1,14 @@ +package com.fangjia.script.wenyan + import com.fangjia.core.RegionData -import com.fangjia.core.util.GeoUtils -import com.fangjia.script.util.CommonUtils -import com.fangjia.script.util.DbUtils -import com.fangjia.script.util.ExcelUtils -import com.fangjia.script.util.Jms -import com.fangjia.script.util.MongoUtils -import com.fangjia.script.util.OpenApiClient -import com.mongodb.BasicDBList -import com.mongodb.BasicDBObject -import com.mongodb.DBCollection -import net.sf.json.JSONObject +import com.fangjia.script.util.ElasticUtils -//import com.fangjia.core.RegionData -//import com.fangjia.core.util.DataUtil -//import com.fangjia.core.util.DateUtil -//import com.fangjia.core.util.HttpRequest -//import com.fangjia.script.util.CommonUtils -//import com.fangjia.script.util.DbUtils -//import com.fangjia.script.util.ExcelUtils -//import com.fangjia.script.util.GeoUtils -//import com.fangjia.script.util.MongoUtils -//import com.fangjia.script.util.OpenApiClient -//import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils -//import com.mongodb.BasicDBObject -//import com.mongodb.DBCollection -//import com.mongodb.DBObject -//import com.mongodb.Mongo -//import groovy.sql.Sql -//import net.sf.json.JSONArray -//import net.sf.json.JSONObject -//import org.apache.commons.codec.digest.DigestUtils -//import org.apache.commons.lang.StringUtils -//import org.apache.lucene.index.Term -//import org.apache.lucene.search.BooleanClause -//import org.apache.lucene.search.BooleanQuery -//import org.apache.lucene.search.TermQuery -// -//import java.util.concurrent.ExecutorService -//import java.util.concurrent.Executors -//import java.util.regex.Pattern -// -////import com.fangjia.core.RegionData -////import com.fangjia.core.util.DateUtil -////import com.fangjia.core.util.HttpRequest -////import com.fangjia.script.util.CommonUtils -////import com.fangjia.script.util.DataUtil -////import com.fangjia.script.util.DbUtils -////import com.fangjia.script.util.ExcelRow -////import com.fangjia.script.util.ExcelUtils -////import com.fangjia.script.util.GeoUtils -////import com.fangjia.script.util.MongoUtils -////import com.fangjia.script.util.OpenApiClient -////import com.mongodb.BasicDBObject -////import com.mongodb.Bytes -////import com.mongodb.DBCollection -////import com.mongodb.DBObject -////import com.mongodb.Mongo -////import com.mongodb.WriteConcern -////import com.mongodb.WriteResult -////import groovy.json.internal.Byt -////import net.sf.json.JSONObject -////import org.apache.commons.lang.StringUtils -////import org.apache.lucene.index.Term -////import org.apache.lucene.search.BooleanClause -////import org.apache.lucene.search.BooleanQuery -////import org.apache.lucene.search.TermQuery -////import org.apache.solr.client.solrj.util.ClientUtils -////import org.bson.types.ObjectId -//// -////import java.util.regex.Matcher -////import java.util.regex.Pattern -//// -//////package com.fangjia.script.wenyan -////// -//////import com.fangjia.core.RegionData -//////import com.fangjia.core.util.BaiDuApiUtils -//////import com.fangjia.core.util.CNNMFilter -//////import com.fangjia.core.util.DataUtil -//////import com.fangjia.core.util.DateUtil -//////import com.fangjia.core.util.DistrictCodeUtils -//////import com.fangjia.core.util.GeoUtils -//////import com.fangjia.core.util.HouseValidator -//////import com.fangjia.datastore.driver.DSCollection -//////import com.fangjia.datastore.driver.DSCursor -//////import com.fangjia.datastore.driver.DataStore -//////import com.fangjia.script.util.CommonUtils -//////import com.fangjia.script.util.CosineSimilarAlgorithm -//////import com.fangjia.script.util.DateUtils -//////import com.fangjia.script.util.DbUtils -//////import com.fangjia.script.util.ExcelUtils -//////import com.fangjia.script.util.HttpRequestUtil -//////import com.fangjia.script.util.OpenApiClient -//////import com.fangjia.script.wenyan.auto.KeywordSearchUtils -//////import com.fangjia.script.wenyan.auto.Poi -//////import com.mongodb.BasicDBObject -//////import com.mongodb.Bytes -//////import com.mongodb.DB -//////import com.mongodb.DBCursor -//////import com.mongodb.DBObject -//////import com.mongodb.Mongo -//////import net.sf.json.JSONArray -//////import net.sf.json.JSONObject -//////import org.apache.commons.lang.StringUtils -//////import org.apache.lucene.index.Term -//////import org.apache.lucene.search.BooleanClause -//////import org.apache.lucene.search.BooleanQuery -//////import org.apache.lucene.search.TermQuery -////// -//////import javax.swing.plaf.synth.Region -//////import java.util.regex.Matcher -//////import java.util.regex.Pattern -////// -///////** -////// * Created by wenyan on 2015/11/23. -////// */ -////////def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\??????????.xlsx", 1) -////////data.each {List item-> -//////// def addr = item[1].toString().replaceAll("\\s","") -//////// JSONObject resp = OpenApiClient.addressMatch("???", addr, "shop", false) -//////// if(resp.containsKey("name")){ -//////// String city = resp.getString("city"),region = resp.getString("district"),name = resp.getString("name") -//////// JSONObject res = HttpRequestUtil.getJsonContent("http://sh.sha-88.qa.fangjia.com/chafangtong/people/score2",[cityName:city,region:region,districtName:name,ajax:"1"]) -//////// if(res.containsKey("populationScore")){ -//////// println(addr + "\t" + res.officePopulationScore + "\t" + res.populationScore) -//////// }else{ -//////// println(addr) -//////// } -//////// }else{ -//////// println(addr) -//////// } -////////} -////////DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("coredata", "analy_road", "coredata.mongo.db.fangjia.com") -////////def idx = 0 -////////ANALY_SITE_COLL.find(new BasicDBObject(), new BasicDBObject("primary_map",1)).batchSize(10000).each {BasicDBObject dbo -> -//////// idx ++ -//////// if(idx % 100000 == 0){ -//////// println(idx) -//////// } -//////// BasicDBObject key = dbo.get("primary_map") -//////// if(key){ -//////// try{ -//////// if((key.getString("region") != null && key.getString("region").length() > 60) || key.getString("name").length() > 60){ -//////// println(dbo) -//////// ANALY_SITE_COLL.remove(new BasicDBObject("_id",dbo._id)) -//////// } -//////// }catch (Exception w){ -//////// println(dbo) -//////// } -//////// -//////// } -////////} -//////// -////////def countNoBuildTypeDistrictNum(){ -//////// def cityList = ["????","???","????","????","???","????","????","????","???","??????","????","????","???","???","??????","???","??","??","???","?人","????","????","???","????","????","???","????","????","??","????","????","????","???","????","????","????","???????","????","???","????","????","????","????","????","????","???","????","????","????","???","???","????","????","????","????","????","????","????","????","????","????","???","????","?????","????","????","????","???","????","???"] -//////// cityList.each {def city-> -//////// def has=0, no=0 -//////// DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0).append("city", city),{BasicDBObject dbo-> -//////// def buildType = dbo.build_type -//////// if(StringUtils.isBlank(buildType)){ -//////// no ++ -//////// }else{ -//////// has++ -//////// } -//////// }, new BasicDBObject("build_type", 1).append("city",1).append("region",1).append("name",1)) -//////// println("$city\t${has}\t${no}") -//////// } -////////} -//////// -////////def calArea(def city, def region, def name){ -//////// DSCollection SEABIRD = new DataStore("datastore.db.fangjia.com").getCollection("fangjia.seabird") -//////// def query = new BasicDBObject() -//////// query.append("city", city) -//////// query.append("region", region) -//////// query.append("district_name", name) -//////// query.append("cat", "sell") -//////// query.append("visible", 0) -//////// double area = 0 -//////// int count = 0 -//////// SEABIRD.find(query, new BasicDBObject("area", 1)).batchSize(20000).each {BasicDBObject dbo -> -//////// if(dbo.area && dbo.area > 0){ -//////// area += dbo.area -//////// count ++ -//////// } -//////// } -//////// if(area > 0){ -//////// return DataUtil.roundDouble(area/(double)count, 2) -//////// }else{ -//////// query.removeField("visible") -//////// DbUtils.seawater.find(query, new BasicDBObject("area", 1)).batchSize(20000).limit(20000).each {BasicDBObject dbo -> -//////// if(dbo.area && dbo.area > 0){ -//////// area += dbo.area -//////// count ++ -//////// } -//////// } -//////// if(area > 0){ -//////// return DataUtil.roundDouble(area/(double)count, 2) -//////// } -//////// return null; -//////// } -//////// -////////} -//////// -////////def getMarkUp(def city,def region,def name,def avgPrice){ -//////// def day = DateUtil.getFirstDayOfWeek(DateUtil.add(new Date(), Calendar.YEAR, -1)) -//////// BasicDBObject one = DbUtils.findOneOnline("district_stat", [city: city,region:region,district_name:name,"estate_type":"С??", weekend:day]); -//////// if(one && one.getDouble("avg_price") > 0){ -//////// return DataUtil.roundDouble(((avgPrice - one.getDouble("avg_price"))*100)/one.getDouble("avg_price"),2) -//////// -//////// } -//////// return null; -////////} -//////// -////////def exoprtDistrictArea(){ -//////// -//////// def orgData = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\????????????????.xlsx", 0 , 0) -//////// orgData.eachWithIndex{ List item, int i -> -//////// if(i != 0 && item[8] != null && item[2] != null){ -//////// if(item[13] != null && item[14] != null){ -//////// def res = OpenApiClient.evaluateDistrictPrice(item[6], item[7], item[8], item[2], 0, item[13], item[14]) -//////// item[4] = res?.totalPrice -//////// item[9] = res?.avgPrice -//////// }else{ -//////// def res = OpenApiClient.evaluateDistrictPrice(item[6], item[7], item[8], item[2], 0) -//////// item[4] = res?.totalPrice -//////// item[9] = res?.avgPrice -//////// } -//////// if(item[9]){ -//////// item[10] = getMarkUp(item[6], item[7], item[8],item[9]) -//////// } -//////// -//////// } -//////// println(item) -//////// } -//////// -//////// ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\????????????????.xlsx",orgData,"????????") -////////} -////////exoprtDistrictArea() -////////def query = new BasicDBObject("city", "???").append("cat", "district").append("visible", 0); -////////def keys = new BasicDBObject("city",1) -////////keys.append("name",1) -////////keys.append("address",1) -////////keys.append("c_date",1) -////////keys.append("mark_map",1) -////////keys.append("ip",1) -////////int total = 0 -////////def cha = 0 -////////def addrDesc = ["??","???","??"] -////////DbUtils.seaweed.find(query, keys).batchSize(5000).each {BasicDBObject dbo-> -//////// def map = dbo.mark_map -//////// if(map && dbo.ip == "MACHINE_SAVE"){ -//////// total ++ -//////// if( addrDesc.contains(map.addr_precision)){ -//////// cha ++ -//////// } -//////// } -////////} -////////println("$total $cha") -////////DB mongo = new Mongo("mongo.db.fangjia.com", 27017).getDB("fangjia") -////////DBCollection DISTRICT_RELATION_COLL = mongo.getCollection("district_relation") -////////DISTRICT_RELATION_COLL.distinct("city") -//////// -////////def cityList = ["芜湖","淮南","揭阳","茂名","邯郸","安阳","南阳","四平","本溪","潍坊","淄博","大同","临汾","咸阳","绵阳","宜宾"] -////////println(cityList) -////////int groupCount = 0 -////////int count = 0 -////////cityList.each {def city-> -//////// int group = 0 ; -//////// int total = 0 -//////// DbUtils.executeQueryOnline("district_relation", new BasicDBObject("city", city).append("category","district"),{BasicDBObject dbo-> -//////// group ++ -//////// List relations = dbo.relations -//////// total += relations.size() -//////// }) -//////// count += total -//////// groupCount += group -//////// println("$city $group $total") -////////} -////////println(" $count $groupCount") -////// -////// -////////DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "address", "192.168.0.136") -////////REGION_BLOCK_COLL.find(new BasicDBObject("is_match",1)).each {BasicDBObject dbo-> -//////// String addr = dbo.getString("addr") -//////// Pattern pattern = Pattern.compile(".*" + dbo.result.name +".+") -//////// if(addr ==~ pattern){ -//////// println(dbo) -//////// } -////////} -////////DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("addrepo", "crawl_task", "192.168.0.61") -////////REGION_BLOCK_COLL.update(new BasicDBObject("taskType",0).append("status",1), new BasicDBObject('$set', new BasicDBObject("taskType", 1)),false,true) -////// -////////def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\商铺314.xls", 3, 0) -//////// -////////def cacheData = [] -////////def keys = [] -////////data.eachWithIndex{ List entry, int i -> -//////// String key = "" -//////// if(entry[3]){ -//////// key += entry[3] -//////// } -//////// if(entry[4]){ -//////// key += entry[4].toString() -//////// } -//////// if(entry[8]){ -//////// key += entry[8].toString() -//////// } -//////// if(entry[6]){ -//////// key += entry[6].toString() -//////// } -//////// if(!keys.contains(key)){ -//////// cacheData << entry -//////// keys << key -//////// } -////////} -////////ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\商铺314.xls",cacheData,"解析楼层") -////// -////// -////// -////////cache.each {k,v-> -//////// println(v) -////////} -////////def data2 = ExcelUtils.read("E:\\迅雷下载\\合肥(梦).xls", 0, 0) -////////data2.eachWithIndex{ List entry, int i -> -//////// if(i != 0){ -//////// def item = cache.get(entry[0]) -//////// if(item != null && !(StringUtils.isNotBlank(entry[22]) || StringUtils.isNotBlank(entry[23]) || StringUtils.isNotBlank(entry[24]))){ -//////// entry[22] = item[22] -//////// entry[23] = item[24] -//////// entry[24] = item[23] -//////// } -//////// } -////////} -////////ExcelUtils.write("E:\\迅雷下载\\合肥(合).xls", data2,"房产数据测试") -////// -////////DbUtils.executeQueryOnline("town", new BasicDBObject(),{BasicDBObject dbo-> -//////// println("${dbo.city}\t${dbo.region}\t${dbo.name}\t${dbo.address}") -//////// -////////// String address = dbo.address -////////// try { -////////// String region = dbo.region -////////// String city = dbo.city -//////////// println(dbo) -////////// -////////// }catch (Exception e){ -//////////// println("-------------》" + dbo) -//////////// DbUtils.executeRemoveOnline("town", new BasicDBObject("_id", dbo._id)) -////////// } -//////// -////////}) -////////DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("addrepo", "crawl_task", "192.168.0.61") -////////BasicDBObject dbo = REGION_BLOCK_COLL.findOne(new BasicDBObject("keyword","写字楼,住宅,公寓,大厦,别墅")) -////////def citys = ["鄂尔多斯","开封","朔州","呼伦贝尔","忻州","晋中","宝鸡","运城","渭南","邯郸","芜湖","佛山","东莞","齐齐哈尔","大同","绵阳","潍坊","常州","大庆"] -////////citys.each { -//////// dbo.removeField("_id") -//////// dbo.append("status",1) -//////// dbo.append("city",it) -//////// REGION_BLOCK_COLL.save(dbo) -////////} -////// -////////Pattern fenqiPattern = Pattern.compile(".*(\\w|\\d|东|南|西|北|一|二|三|四|五|六|七|八|九|十)+(区|期)\$") -//////// -////////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat","district").append("visible", 0),{BasicDBObject dbo-> -//////// try{ -//////// if(!(dbo.name ==~ fenqiPattern)){ -//////// Pattern pattern = Pattern.compile(dbo.getString("name") + "(\\w|\\d|东|南|西|北|一|二|三|四|五|六|七|八|九|十)+(区|期)") -//////// List alias = dbo.alias -//////// if(alias){ -//////// def hasFenQi = false -//////// Iterator it = alias.iterator() -//////// while(it.hasNext()){ -//////// def ali = it.next(); -//////// if(ali ==~ pattern){ -//////// def one = DbUtils.seaweed.findOne(new BasicDBObject("city", dbo.city).append("name", ali).append("region", dbo.region).append("cat","district").append("visible",0)) -//////// if(one){ -//////// hasFenQi = true -//////// it.remove() -//////// println("${dbo.toString()} ${ali}") -//////// } -//////// } -//////// } -//////// if(hasFenQi){ -//////// DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id",dbo._id), new BasicDBObject('$set', new BasicDBObject('alias', alias))) -//////// } -//////// } -//////// } -//////// -//////// }catch (Exception e){ -//////// -//////// } -//////// -//////// -////////}, new BasicDBObject("city", 1).append("region",1).append("name",1).append("alias",1)) -////// -////////Pattern fenqiPattern = Pattern.compile(".*(\\w|\\d|东|南|西|北|一|二|三|四|五|六|七|八|九|十)+(区|期)\$") -////////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat","district").append("visible", 0),{BasicDBObject dbo-> -//////// try{ -//////// if(!(dbo.name ==~ fenqiPattern)){ -//////// Pattern pattern = Pattern.compile(dbo.getString("name") + "(\\w|\\d|东|南|西|北|一|二|三|四|五|六|七|八|九|十)+(区|期)") -//////// List alias = dbo.alias -//////// if(alias){ -//////// def hasFenQi = false -//////// for(def ali : alias){ -//////// if(ali ==~ pattern){ -//////// hasFenQi = true -//////// break -//////// } -//////// } -//////// if(hasFenQi){ -//////// println("${dbo.city}\t${dbo.region}\t${dbo.name}\t${alias.join(",")}") -//////// } -//////// } -//////// } -//////// -//////// }catch (Exception e){ -//////// -//////// } -//////// -//////// -////////}, new BasicDBObject("city", 1).append("region",1).append("name",1).append("alias",1)) -////////def city70 = ["延边","三亚","上海","深圳","杭州","唐山","石家庄","兰州","安庆","合肥","乌鲁木齐","长春","赣州","九江","南昌","哈尔滨","长沙","太原","青岛","宜昌","武汉","沈阳","西安","成都","丹东","大连","郑州","昆明","宁波","金华","温州","北京","北海","南京","南宁","厦门","吉林","呼和浩特","大理","天津","扬州","无锡","广州","徐州","惠州","桂林","泉州","洛阳","济南","海口","湛江","烟台","福州","秦皇岛","襄阳","西宁","贵阳","重庆","银川","遵义","蚌埠","济宁","包头","锦州","牡丹江","平顶山","岳阳","常德","韶关","泸州","南充"] -////////def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\房价调查完成合并数据0324终-final16.xls") -////////def names = [] -////////int c = 0 -////////data.each {List row-> -//////// def city = row[11] -//////// if(StringUtils.isBlank(city)){ -//////// city = row[2] -//////// } -//////// def name = row[8] -//////// def cate = row[12] -//////// if(StringUtils.isBlank(cate) && city70.contains(city) && StringUtils.isNotBlank(name)){ -//////// BooleanQuery nameQuery = new BooleanQuery(); -//////// nameQuery.add(new TermQuery(new Term("name", name)), BooleanClause.Occur.SHOULD); -//////// nameQuery.add(new TermQuery(new Term("alias", name)), BooleanClause.Occur.SHOULD); -//////// BasicDBObject dbObject = DbUtils.seaweed.findOne(new BasicDBObject("city", city).append("visible", 0).append('$sr', new BasicDBObject("sr.query", nameQuery.toString()))) -//////// if(dbObject == null){ -//////// names << "${city}#${name}" -//////// } -//////// } -//////// println(c++) -////////} -////////names.unique() -//////// -////////def data2 = [] -////////data2 << ["序号", "城市", "名称"] -////////int index = 0 -////////names.each {String it-> -//////// index ++ -//////// data2 << [index, it.split("#")[0],it.split("#")[1]] -////////} -////////DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap_source3", "192.168.0.61") -////////def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\房价调查.xls",0,0) -////////data.eachWithIndex{ List entry, int i -> -//////// if(i != 0 && entry[4] == null){ -//////// def one = REGION_BLOCK_COLL.findOne(new BasicDBObject("city",entry[1] + "市").append("name",Pattern.compile(".*" + entry[2] + ".*", Pattern.CASE_INSENSITIVE))) -//////// if(one){ -//////// entry[4] = "地图有相似:" + one.name -//////// println(entry) -//////// } -//////// -//////// } -////////} -////////ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\房价调查.xls",data,"调查结果2") -////////DBCollection ANALY_ROAD_COLL = MongoUtils.getCollectionByName("coredata", "analy_site", "coredata.mongo.db.fangjia.com", 27017) -////////def city = "上海" -//////// def regions = [] -//////// ANALY_ROAD_COLL.find(new BasicDBObject("city", city).append("data_status", 2).append("cat","district"), new BasicDBObject("region",1)).each {BasicDBObject dbo-> -////////// if(!isNosie(city, dbo.region)){ -//////// regions << dbo.region -////////// } -//////// } -//////// regions.unique() -//////// regions.each { -//////// println("${city}\t${it}") -//////// } -//////// -//////// -////////def isNosie(String city ,String region){ -//////// if(city == region){ -//////// return true -//////// } -//////// def nosie = ["周边" , "其他", "其它" , "以外", "社区" , "地区" ,"家属区","小区",":","#"] -//////// for(def n: nosie){ -//////// if(region.contains(n)){ -//////// return true -//////// } -//////// } -//////// if(region ==~ /.*\w+.*/){ -//////// return true -//////// } -//////// if(region.contains("(") || region.contains(">") || region.contains(".") || region.contains("·") || region.contains("、")){ -//////// return true -//////// } -//////// if(region.length() < 2){ -//////// return true -//////// } -//////// if(!region.endsWith("区")){ -//////// return true -//////// } -//////// return false -////////} -////// -////////def data = ExcelUtils.read("C:\\Users\\wenyan\\Desktop\\经纬度地址测试.xlsx", 0 ,0) -////////data.eachWithIndex{ List item, int i -> -//////// if(i != 0 && i == 61){ -//////// final latSelf = item[1].toString().toDouble() -//////// final lngSelf = item[2].toString().toDouble() -//////// DBObject sdq = new BasicDBObject(); -//////// sdq.put("sd.point", latSelf + "," + lngSelf); -//////// sdq.put("sd.sfield", "lat_lng"); -//////// sdq.put("sd.distance", String.valueOf((double) 200 / 1000.0)); -//////// DBObject q = new BasicDBObject(); -//////// q.put("cat", "district"); -//////// q.put("visible", 0); -//////// q.put('$sd', sdq); -//////// BasicDBObject district = DbUtils.seaweed.findOne(q) -//////// if(district){ -//////// item[3] = district.name -//////// item[4] = district.address -//////// item[5] = GeoUtils.calculateDistance(district.lng2/10000000000, district.lat2/10000000000,lngSelf, latSelf) -//////// item[6] = district.city -//////// item[7] = 'db' -//////// }else{ -//////// -//////// JSONObject json = BaiDuApiUtils.geoconv(lngSelf, latSelf, 3) -//////// final baiduLng = json.getDouble("x") -//////// final baiduLat = json.getDouble("y") -//////// -//////// JSONObject result = BaiDuApiUtils.search("住宅区",baiduLng,baiduLat, 1000, 2, 10, 0) -//////// if(result.containsKey("results") && result.getJSONArray("results").size() > 0){ -//////// Collections.sort(result.getJSONArray("results"), new Comparator(){ -//////// @Override -//////// int compare(JSONObject o1, JSONObject o2) { -//////// Double d1 = GeoUtils.calculateDistance(baiduLng, baiduLat, o1.getJSONObject("location").getDouble("lng"), o1.getJSONObject("location").getDouble("lat")) -//////// Double d2 = GeoUtils.calculateDistance(baiduLng, baiduLat, o2.getJSONObject("location").getDouble("lng"), o2.getJSONObject("location").getDouble("lat")) -//////// return d1.compareTo(d2) -//////// } -//////// }) -//////// -//////// JSONObject dbo = result.getJSONArray("results")[0] -//////// double lat = dbo.getJSONObject("location").getDouble("lat") -//////// double lng = dbo.getJSONObject("location").getDouble("lng") -//////// item[3] = dbo.name -//////// item[4] = dbo.address -//////// item[5] = GeoUtils.calculateDistance(lng, lat, item[2].toString().toDouble(), item[1].toString().toDouble()) -//////// item[6] = BaiDuApiUtils.getCityByGeo(lng,lat).replace("市","") -//////// JSONObject resp = OpenApiClient.addressMatch(item[6],item[3], null, false) -//////// if(resp.getDouble("credit") > 0 && (resp.getString("category") == "office" || resp.getString("category") == "property") && resp.getString("suggestName") == item[3]){ -//////// if(resp.getString("address") != null){ -//////// item[4] = resp.getString("address") -//////// item[6] = resp.getString("city") -//////// }else{ -//////// def s = getStandardAddress(item[6],item[4]) -//////// if(s != null){ -//////// item[4] = s -//////// } -//////// } -//////// }else{ -//////// def s = getStandardAddress(item[6],item[4]) -//////// if(s != null){ -//////// item[4] = s -//////// } -//////// } -//////// } -//////// } -//////// -//////// -//////// -//////// -//////// println(item) -//////// } -////////} -////////ExcelUtils.write("C:\\Users\\wenyan\\Desktop\\经纬度地址测试.xlsx",data,"222") -//////// -//////// -////////def String getStandardAddress(def city, def addr) { -//////// if (StringUtils.isBlank(addr)) { -//////// return null -//////// } -//////// JSONObject result = OpenApiClient.addressStandardize(city, addr) -//////// if (result.containsKey("standardAddress") && result.getBoolean("standardAddress")) { -//////// def standardAddr = result.getString("street") -//////// if (result.containsKey("streetNumber")) { -//////// standardAddr += result.getString("streetNumber") -//////// } -//////// return standardAddr -//////// } -//////// return null -////////} -////////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\房价调查 - 副本.xls",{List item-> -//////// def city = item[1] -//////// def name = item[2].toString().trim() -//////// item[6] = getCompareStatus(city, name) -////////}) -//////// -////////def getCompareStatus(def city, def name){ -//////// -//////// DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("coredata", "analy_site", "coredata.mongo.db.fangjia.com", 27017) -//////// def one = (BasicDBObject)ANALY_SITE_COLL.findOne(new BasicDBObject("cat","district").append("city", city).append("district_name", name), new BasicDBObject("data_status", 1)) -//////// if(one){ -//////// String dataStatus; -//////// switch (one.getInt("data_status")){ -//////// case 0:dataStatus = "正常";break; -//////// case 1:dataStatus = "人工删除";break; -//////// case 2:dataStatus = "区域错误";break; -//////// case 3:dataStatus = "被别名关联";break; -//////// case 4:dataStatus = "名称错误";break; -//////// case 5:dataStatus = "百度判定删除";break; -//////// case 6:dataStatus = "CPDB删除";break; -//////// case 7:dataStatus = "物业不匹配删除";break; -//////// default:dataStatus ="未知"; -//////// } -//////// return "对比数据存在:${dataStatus}" -//////// } -//////// return null -////////} -////////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap_source3", "192.168.0.61", 27017) -////////def ids = [] -////////BAIDU_MAP_COLL.find(new BasicDBObject(), new BasicDBObject("uid",1)).batchSize(10000).each {BasicDBObject dbo-> -//////// if(ids.contains(dbo.uid)){ -//////// BAIDU_MAP_COLL.remove(new BasicDBObject("_id", dbo._id)) -//////// println(dbo.uid) -//////// }else{ -//////// ids << dbo.uid -//////// } -////////} -////// -////////ExcelUtils.modify("D:\\1112222.xlsx",{List item-> -//////// if(item[0] && item[1] && item[2]){ -//////// try{ -//////// def one = DbUtils.findOneOnSeaweed(new BasicDBObject("city", item[0]).append("region", item[1]).append("name", item[2]).append("cat","district").append("visible",0)) -//////// if(one){ -//////// double lng = one.lng2/10000000000 -//////// double lat = one.lat2/10000000000 -//////// def point = getGeoPoint(item[4]) -//////// if(point){ -//////// item[6] = com.fangjia.script.util.GeoUtils.calculateDistance(lng,lat,point.lng, point.lat) -//////// } -//////// } -//////// -//////// -//////// }catch (Exception e){ -//////// -//////// } -//////// -//////// } -////////}) -////// -////////def getGeoPoint(String address){ -//////// JSONObject geoPoint = BaiDuApiUtils.geocoder(null,address) -//////// if(geoPoint.containsKey("result") && geoPoint.getJSONObject("result").containsKey("location")){ -//////// def point = [:] -//////// JSONObject location = geoPoint.getJSONObject("result").getJSONObject("location"); -//////// point.lng = location.getDouble("lng") -//////// point.lat = location.getDouble("lat") -//////// return point -//////// } -//////// return null; -////////} -////// -////////def data = ExcelUtils.read("D:\\1112222.xlsx",0,0) -////////def d = [] -////////data.eachWithIndex{ List entry, int i -> -//////// if(i == 0){ -//////// d << entry -//////// }else{ -//////// if(entry[6] < 1000 && StringUtils.isNotBlank(entry[1])){ -//////// d << entry -//////// } -//////// -//////// } -////////} -////////ExcelUtils.write("D:\\1112222.xlsx",d,"结果2") -//////// -////////DBCollection MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap_source3", "192.168.0.61", 27017) -////////DBCollection BAIDU_CITY_COLL = MongoUtils.getCollectionByName("addrepo", "baidu_citys", "192.168.0.61", 27017) -//////// -////////BAIDU_CITY_COLL.find().addOption(Bytes.QUERYOPTION_NOTIMEOUT).each { BasicDBObject city -> -//////// if(city.getInt("cityCode") != 1){ -//////// def keys = new HashSet() -//////// MAP_COLL.find(new BasicDBObject("cityCode", city.getInt("cityCode")), new BasicDBObject("format_region", 1).append("region", 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(10000).each {BasicDBObject dbo-> -//////// def region = dbo.region -//////// def formatRegion = dbo.format_region -//////// if(region == formatRegion && !RegionData.isRegion(city.name, formatRegion)){ -//////// keys << "${city.name} ${dbo.region}" -//////// } -//////// } -//////// keys.each { -//////// println(it) -//////// } -//////// } -////////} -////////DbUtils.seaweed.find(new BasicDBObject().append("cat", "district").append("visible", 0), new BasicDBObject("name", 1).append("city",1)).batchSize(10000).each {BasicDBObject dbo-> -//////// if(dbo.getString("name") ==~ /.*\d+期/){ -//////// println(dbo) -//////// } -////////} -////////def keys = new HashSet() -////////DBCollection street = new Mongo("mongo.db.fangjia.com", 27017).getDB('fangjia').getCollection('town'); -////////street.find().each { -//////// if(keys.contains(it.uid)){ -//////// street.remove(it) -//////// println(it) -//////// }else{ -//////// keys << it.uid -//////// } -////////} -////////ExcelUtils.modify("C:\\Users\\wenyan\\Documents\\自动入库数量.xlsx",{List row-> -//////// row[1] = DbUtils.executeCountOnSeaweed(new BasicDBObject("city", row[0]).append("cat","district").append("visible",0).append("source","machine")) -////////}) -////////println(false^false) -////// -////////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0),{BasicDBObject dbo-> -//////// if(dbo.getString("name").contains("商住") && dbo.getString("estate_type2") != "商住"){ -//////// println(dbo) -//////// DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', new BasicDBObject("estate_type2", "商住"))) -//////// } -////////}, new BasicDBObject("name",1).append("estate_type2",1)) -////// -////// -////// -////// -////////DbUtils.executeQueryOnline("street",new BasicDBObject("province","内蒙古自治区"),{BasicDBObject dbo -> -//////// dbo.append("province", "内蒙古") -//////// street.save(dbo) -//////// println(dbo) -//////// -////////}) -////// -////////def OUTPUT_FILE = "E:\\数据\\申银万国数据\\测试数据.xlsx" -////////ExcelUtils.multiThreadingModify(OUTPUT_FILE,{List item-> -//////// item[1] = item[0] * 2 -//////// println(item) -//////// -////////},0) -////// -////////def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\房价调查完成合并数据0324终-final16.xls",0) -////////def data2 = [] -////////data2 << ["序号","地址","原始城市","期望城市","匹配城市","期望小区名","匹配小区名"] -//////// -////////data.each { -//////// if(StringUtils.isNotBlank(it[11]) && it[2] != it[11]){ -//////// data2 << [it[0],it[4],it[2],it[11],null,it[3]] -//////// } -////////} -////////ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\城市判定测试样本.xls", data2, "样本") -////// -////////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\城市判定测试样本.xls",{ -//////// def city = it[2] -//////// def addr = it[1] -//////// def exCity = it[3] -//////// JSONObject resp = OpenApiClient.addressStandardize(city, addr) -//////// if(resp == null){ -//////// resp = OpenApiClient.addressStandardize(city, addr) -//////// } -//////// if(resp.containsKey("cityStatus") && "SURE" == resp.getString("cityStatus")){ -//////// def matchCity = resp.getString("city") -//////// if(matchCity.contains(exCity) || exCity.contains(matchCity)){ -//////// it[5] = "一致" -//////// }else{ -//////// it[5] = "不一致" -//////// } -//////// it[4] = matchCity -//////// }else if(resp.containsKey("candidateCities") && resp.getJSONArray("candidateCities").contains(exCity)){ -//////// it[5] = "包含" -//////// it[4] = resp.getJSONArray("candidateCities").join(",") -//////// }else if(resp.containsKey("candidateCities") && resp.getJSONArray("candidateCities").size() > 0){ -//////// it[4] = resp.getJSONArray("candidateCities").join(",") -//////// it[5] = "其他城市" -//////// }else{ -//////// it[5] = "失败" -//////// } -//////// println(it) -////////}) -////// -////////def data = [:] -////////DBCollection street = new Mongo("192.168.0.60", 27017).getDB('business').getCollection('open_uri_log'); -////////println street.count(new BasicDBObject("user_id","1007498").append("c_date",new BasicDBObject('$gt', Date.parse("yyyyMMdd","20160502")))) -////// -////////println(com.fangjia.script.util.DataUtil.formateAddress("芜湖","九华南路文昌路")) -////// -////// -////////def c = 0 -////////street.find(new BasicDBObject("user_id","1007498").append("c_date",new BasicDBObject('$gt', Date.parse("yyyyMMdd","20160502"))),new BasicDBObject("parameter_map",1)).skip(50*10000).batchSize(10000).each {BasicDBObject it-> -//////// def params = it.parameter_map as BasicDBObject -//////// params.remove("token") -//////// if(params.district && params.district.toString().contains("?") ){ -//////// c ++ -//////// }else{ -//////// println(params) -//////// } -////////} -////////println(c) -////// -////// -////// -////////DbUtils.executeQueryOnSeaweed(new BasicDBObject("visible", 0).append("cat", "district"),{BasicDBObject dbo-> -//////// if(dbo.name ==~ /.*期.+/){ -//////// println(dbo) -//////// } -////////},new BasicDBObject("name",1)) -////////CommonUtils.findAllCity().each { -//////// DbUtils.seaweed.find(new BasicDBObject().append("cat", "district").append("visible", 0).append("city", it), new BasicDBObject("name", 1).append("city",1).append("alias", 1).append("region", 1)).batchSize(10000).each {BasicDBObject dbo-> -//////// if(dbo.name ==~/.*期至.*期$/){ -//////// List alias = dbo.alias -//////// def name = alias.get(alias.size() -1) -//////// alias.remove(name) -//////// alias << dbo.name -//////// println(name) -//////// println(alias) -////////// DbUtils.seaweed.update(new BasicDBObject("_id", dbo._id) , new BasicDBObject('$set', new BasicDBObject("alias", alias).append("name",name))) -//////// } -//////// } -////////} -////////def data01 = ExcelUtils.read("e:\\Users\\wenyan\\Desktop\\申万数据0508结果.xlsx",0,0) -////////def data02 = ExcelUtils.read("e:\\Users\\wenyan\\Desktop\\申万数据0508结果.xlsx",1,1) -////////def data03 = ExcelUtils.read("e:\\Users\\wenyan\\Desktop\\申万数据0508结果.xlsx",2,1) -////////def data04 = ExcelUtils.read("e:\\Users\\wenyan\\Desktop\\申万数据0508结果.xlsx",3,1) -////////data01.addAll(data02) -////////data01.addAll(data03) -////////data01.addAll(data04) -//////// -////////def key = [] -////////def data = [] -//////// -////////data01.each { -//////// if(!key.contains(it[0].toString() + it[1].toString())){ -//////// data << it -//////// key << it[0].toString() + it[1].toString() -//////// } -////////} -////////ExcelUtils.write("e:\\Users\\wenyan\\Desktop\\申万数据0508去重.xlsx",data,"去重") -////// -////////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\大地保险结果2.xls",{List data-> -//////// if(data[13] == null){ -//////// data[13] = data[7] -//////// } -//////// println(data) -////////}) -////// -////////def data = ExcelUtils.read("E:\\数据\\日志\\温州小区数据.xlsx") -////////def houseDataSet = [] -////////houseDataSet << ["城市", "区域", "小区名", "面积" , "版块", "建筑类型","朝向","装修","厅数","楼层","总楼层","户型","信息发布时间","室数","卫数","来源","剩余使用年限","地址","物业类型","建筑结构","开盘时间","小区均价","建造年代"," "] -////////data.each {List district-> -//////// -////////} -//////// -//////// -////////def List findHouse(city, region, name){ -//////// DBCollection houseTable = MongoUtils.getCollectionByName("fangjia_temp", "wz_houses", "192.168.0.136") -//////// List house = [] -//////// DBCursor cursor = houseTable.find(new BasicDBObject("city", city).append("region", region).append("district_name", name)) -//////// while(cursor.hasNext()){ -//////// house << cursor.next() -//////// } -//////// return house -////////} -////////final String TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; -////////def BULIDS_TYPE_CODE = [:] -////////BULIDS_TYPE_CODE.put("多层", "10"); -////////BULIDS_TYPE_CODE.put("小高层", "11"); -////////BULIDS_TYPE_CODE.put("超高层", "12"); -////////BULIDS_TYPE_CODE.put("高层", "13"); -////////BULIDS_TYPE_CODE.put("花园洋房", "14"); -////////BULIDS_TYPE_CODE.put("老洋房", "15"); -////////BULIDS_TYPE_CODE.put("四合院", "16"); -////////BULIDS_TYPE_CODE.put("独栋", "17"); -////////BULIDS_TYPE_CODE.put("双拼", "18"); -////////BULIDS_TYPE_CODE.put("联排", "19"); -////////BULIDS_TYPE_CODE.put("叠加", "20"); -//////// -//////// -//////// -////////ExcelUtils.multiThreadingModify("E:\\\\数据\\\\日志\\\\温州小区数据.xlsx",{row-> -//////// def district = DbUtils.seaweed.findById(row[0]) -//////// if(district){ -//////// row[13] = district.cubage_percent -//////// } -//////// println(row) -////////}) -////// -//////def dataSet = ExcelUtils.read("E:\\数据\\日志\\温州小区数据.xlsx") -//////def districtMap = [:] -//////dataSet.each { -////// def key = "${it[1]}#${it[2]}#${it[3]}" -////// districtMap[key.toString()] = it -////// -////// -//////} -//////def data = [] -//////def title = ["城市", "区域", "小区名","房屋面积","所属板块","建筑类型","朝向","装修","室数量","厅数量","卫数量","楼层","总楼层","户型","信息发布时间","房屋挂牌价格","房源均价","剩余使用年限","小区均价","地址","物业类型","建筑结构","开盘时间","学校数量","公交站数量","建造年代","绿化率(%)","容积率(%)","物业费(元/平米/月)","地铁站数量"] -//////DBCollection houseTable = MongoUtils.getCollectionByName("fangjia_tmp", "wz_houses", "192.168.0.136") -//////DBCursor cursor = houseTable.find().sort(new BasicDBObject("district_name", 1).append("region", 1)) -//////BasicDBObject house -//////int no = 1 -//////while(cursor.hasNext()){ -////// house = cursor.next() -////// def key = "${house.city}#${house.region}#${house.district_name}".toString() -////// List district = districtMap.get(key) -////// if(district){ -////// def h = [] -////// h[0] = house.city -////// h[1] = house.region -////// h[2] = house.district_name -////// h[3] = house.area -////// if(district[7] && district[7].toString().length() < 8){ -////// h[4] = district[7] -////// } -////// h[5] = district[5] -////// h[6] = HouseValidator.fetchDirectionInfo(house.direction) -////// h[7] = HouseValidator.fetchFitmentInfo(house.fitment) -////// if(house.room && house.room > 0 && house.room < 10){ -////// h[8] = house.room -////// } -////// if(house.hall && house.hall > 0 && house.hall < 10){ -////// h[9] = house.hall -////// } -////// if(house.toilet && house.toilet && house.toilet < 10){ -////// h[10] = house.toilet -////// } -////// if(house.height && house.height < 40){ -////// h[12] = house.height -////// } -////// if(house.floor && ((house.height && house.floor < house.height ) || (house.floor < 40))){ -////// h[11] = house.floor -////// } -////// -////// h[13] = getHouseType(h[8] , h[9], h[10]) -////// h[14] = ((Date)house.publish_date)?.format("yyyy-MM-dd") -////// h[15] = house.total_price -////// if(house.total_price && house.area){ -////// h[16] = (house.total_price/house.area).toDouble().toInteger() -////// -////// }else{ -////// continue -////// } -////// h[17] = district[9] -////// h[18] = district[8] -////// if(h[18] && h[16] && (Math.abs(h[18] - h[16])/h[16]) > 0.3){ -////// continue -////// } -////// -////// h[19] = district[6] -////// if(h[19]){ -////// h[19] = h[19].toString().replaceAll("\\s", "").replaceAll("\\." ,"").replaceAll("·","") -////// } -////// h[20] = district[4] -////// h[22] = district[16] -////// h[23] = district[11] -////// h[24] = district[10] -////// h[25] = district[17] -////// h[26] = district[12] -////// h[27] = district[13] -////// h[28] = district[14] -////// h[29] = district[15] -////// if(data.isEmpty()){ -////// data << title -////// } -////// data << h -////// if(data.size() % 40000 == 0){ -////// ExcelUtils.write("E:\\数据\\日志\\温州小区房源数据${no}.xlsx".toString(), data, "房源") -////// data.clear() -////// no++ -////// } -////// } -//////} -//////ExcelUtils.write("E:\\数据\\日志\\温州小区房源数据${no}.xlsx",data,"房源") -////// -////// -////// -//////public String getDomainName(String url) { -////// if (StringUtils.isNotBlank(url)) { -////// Pattern p = Pattern.compile("[^//]*?\\.(com|cn|net|org|biz|info|cc|tv)", Pattern.CASE_INSENSITIVE); -////// Matcher matcher = p.matcher(url); -////// if (matcher.find()) { -////// return matcher.group(); -////// } -////// -////// } -////// return "fangjia.com"; -//////} -////// -////// String getHouseType(room, hall, toilet) { -////// StringBuilder sb = new StringBuilder(); -////// if (room != null) { -////// sb.append(room + "室"); -////// if (hall != null) { -////// sb.append(hall + "厅"); -////// } -////// if (toilet != null) { -////// sb.append(toilet + "卫"); -////// } -////// } -////// return sb.toString(); -//////} -////// -//////public String getOpenDate(BasicDBObject district){ -////// if(district.open_date !=null){ -////// return DateUtil.formatToYYYYMMDD(district.open_date); -////// } -////// -////// if(StringUtils.isNotBlank(district.live_date)){ -////// return DateUtil.formatToYYYYMMDD(DateUtil.parseStringToDate(district.live_date)); -////// } -////// if(StringUtils.isNotBlank(district.finish_building_date)){ -////// return DateUtil.formatToYYYYMMDD(DateUtil.parseStringToDate(district.finish_building_date)); -////// } -////// return null; -//////} -////// -//////private Integer getYearFormDate(String dateStr) { -////// if (dateStr != null && StringUtils.isNotBlank(dateStr)) { -////// Date date = DateUtil.parseStringToDate(dateStr); -////// if (date != null) { -////// int year = date.getYear() + 1900; -////// return year; -////// } -////// } -////// return null; -//////} -////// -//////private Integer getBuildYear(String finishDate, String liveDate, String buildDate ,Date openDate) { -////// -////// Integer finishYear = getYearFormDate(finishDate); -////// Integer liveYear = getYearFormDate(liveDate); -////// Integer buildYear = getYearFormDate(buildDate); -////// Integer openYear = null; -////// if(openDate != null){ -////// openYear = Integer.valueOf(DateUtil.formatByPattern(openDate,"yyyy")); -////// } -////// int minYear = Integer.MAX_VALUE; -////// if (finishYear != null && finishYear < minYear) { -////// minYear = finishYear; -////// } -////// if (liveYear != null && liveYear < minYear) { -////// minYear = liveYear; -////// } -////// if (buildYear != null && buildYear < minYear) { -////// minYear = buildYear; -////// } -////// if(openYear != null && openYear < minYear){ -////// minYear = openYear; -////// } -////// if(minYear == Integer.MAX_VALUE){ -////// return null; -////// } -////// return minYear; -//////} -////// -//////private Integer extractYear(String s) { -////// Pattern p = Pattern.compile("(\\d+)"); -////// Matcher m = p.matcher(s); -////// if (m.find()) { -////// return Integer.parseInt(m.group(1)); -////// } -////// return null; -//////} -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -////// -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\副本房产测试数据.xlsx",{List data-> -////// if(data[0]){ -////// def city = data[0].toString().replaceAll("市\$" ,""); -////// def keywords = [] -////// if(StringUtils.isNotBlank(data[2])){ -////// keywords << data[2] -////// } -////// if(StringUtils.isNotBlank(data[3])){ -////// keywords << data[3] -////// } -////// -////// if(StringUtils.isNotBlank(data[4])){ -////// keywords << data[4] -////// } -////// JSONObject resp; -////// for(def k : keywords){ -////// resp = OpenApiClient.addressMatch(city, k , "district", false) -////// double credit = resp.getDouble("credit") -////// if(credit > 0){ -////// data[8] = resp.getString("city") -////// data[9] = resp.getString("district") -////// data[10] = resp.getString("suggestName") -////// JSONObject evl = OpenApiClient.evaluateDistrictPrice(data[8], data[9] , resp.getString("name") , data[5].toString().toDouble(), data[10].contains("别墅")?1:0) -////// if(evl != null){ -////// data[6] = evl.avgPrice -////// data[7] = evl.totalPrice -////// } -////// break -////// -////// } -////// } -////// } -//////}) -//////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0),{BasicDBObject dbo-> -////// if(!RegionData.isRegion(dbo.city, dbo.region)){ -////// BasicDBObject d = DbUtils.seaweed.findById(dbo._id.toString(), new BasicDBObject()) -////// println(d) -////// -////// } -//////},new BasicDBObject("region", 1).append("region", 1)) -//////for(int i = 1 ;i < 100;i++){ -////// if(i % 10 == 0){ -////// Thread.sleep(1000 * 1) -////// } -////// Jms jms = Jms.create('tcp://192.168.0.132:61616'); -////// jms.sendSms("1111","【房价网】《房调报告》用户手机13600323919,邮箱knln@qq.com,已成功付款,请及时审核", false) -//////} -//// -//////def cityList = CommonUtils.findAllCity() -////////cityList = ["白山"] -//////cityList.each {city-> -////// def keys = [] -////// DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0).append("city", city),{BasicDBObject it-> -////// if(it.name ==~ /.*(\(|)|\)|().*/){ -////// println(it) -////// } -//////// def key = city + "_" + it.region + "_" + it.name -//////// keys << key -////// -////// },new BasicDBObject("name", 1).append("city", 1).append("region", 1)) -//// -////// DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0).append("city", city),{BasicDBObject it-> -////// if(it.name ==~ Pattern.compile(".*(\\(|()" + it.region + "(\\)|)).*")){ -////// -////// def mainName = it.getString("name").replaceAll("(\\(|()" + it.region + "(\\)|))" ,"").toUpperCase() -////// def key =city + "_" + it.region + "_" + mainName -////// if(keys.contains(key)){ -////// DbUtils.seaweed.remove(new BasicDBObject("_id", it._id)) -////// println("删除:" + it) -////// }else{ -////// def data = new BasicDBObject("name", mainName) -////// DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", it._id), new BasicDBObject('$set', data)) -////// println(it.toString() + data) -////// keys << key -////// } -////// } -////// },new BasicDBObject("name", 1).append("city", 1).append("region", 1)) -//////} -//// -///////** -////// * 把小区修改成删除状态 -////// * @param dbo -////// * @return -////// */ -//////def removeDistrict(BasicDBObject dbo){ -////// DbUtils.seaweed.update(new BasicDBObject("_id",dbo._id), new BasicDBObject('$set', new BasicDBObject("status", 1).append("m_date", new Date()))) -////// println("删除:" + dbo) -//////} -//////new File("E:\\数据\\New Folder").eachFile {def file -> -////// file.eachLine("gbk",{ -////// if(it.contains("RegionBlock") && it.contains("保亭")){ -////// println(it) -////// } -////// }) -//////} -//////CommonUtils.findAllCity().each { -////// DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat","district").append("visible", 0).append("city", it),{BasicDBObject dbo-> -////// if(dbo.ip == 'MAP_SAVE' && dbo.estate_type2 == null){ -////// DbUtils.seaweed.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set',new BasicDBObject("estate_type2", "普通住宅"))) -////// println(dbo) -////// } -////// }, new BasicDBObject("name",1).append("city",1).append("ip",1).append("estate_type2", 1)) -//////} -////// Pattern FUZZY_STAGE_PATTERN = Pattern.compile(".*(一|二|三|四|五|六|七|八|九|十|\\d)+期\$"); -//////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0),{BasicDBObject dbo-> -////// if(dbo.name ==~ FUZZY_STAGE_PATTERN && (dbo.mark_map == null || !dbo.mark_map.baiDuCoordLock)){ -////// def mainName = dbo.getString("name").replaceAll("(一|二|三|四|五|六|七|八|九|十|\\d)+期\$", "") -////// if(mainName.trim().length() > 2){ -////// def query = new BasicDBObject("city", dbo.city).append("region", dbo.region).append("name", mainName).append("cat", "district").append("visible", 0) -////// BasicDBObject one = DbUtils.seaweed.findOne(query) -////// if(one){ -////// if(one.mark_map && one.mark_map.baiDuCoordLock){ -////// def update = new BasicDBObject() -////// update.append("lat", one.lat) -////// update.append("lng", one.lng) -////// update.append("lat2", one.lat2) -////// update.append("lng2", one.lng2) -////// try{ -////// DbUtils.seaweed.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', update)) -////// }catch (Exception e){ -////// println("Error !!!!!!!!!!!!!!!" + query) -////// } -////// }else{ -////// println(dbo) -////// } -////// } -////// } -////// -////// } -//////}, new BasicDBObject("name", 1).append("city", 1).append("region", 1).append("mark_map",1)) -//////DBCollection GAODE_POI_COLL = MongoUtils.getCollectionByName("addrepo", "gaode_poi", "192.168.0.61", 27017) -//////GAODE_POI_COLL.find().each {BasicDBObject dbo-> -////// if(!DataUtil.vectorContains(dbo.getString("cityname"),dbo.city)){ -////// println(dbo) -////// } -//////} -//////DBCollection db136 = MongoUtils.getCollectionByName("business", "house2", "192.168.0.136") -//////def data = [] -//////def title = ["城市","区域","小区名","项目地址","房屋类型","销售面积","销售金额","房龄","所在楼层","室","厅","卫","容积率(百分比)","绿化率(百分比)","楼龄","挂牌时间","公园(数量/最近距离)","超市(数量/最近距离)","购物中心(数量/最近距离)","医院(数量/最近距离)","银行(数量/最近距离)","小学(数量/最近距离)","地铁(数量/最近距离)","公交(数量/最近距离)"] -//////data << title -//////def pageIndex = 1001 -//////db136.find().sort(new BasicDBObject("f0", 1).append("f1",1).append("f2",1).append("f15",1)).batchSize(1000).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each { BasicDBObject house-> -////// def item = [] -////// for(int i =0 ;i <= 23 ;i++){ -////// item << house.get("f" +i) -////// } -////// data << item -////// if(data.size() % 50000 == 0){ -////// ExcelUtils.write("E:\\数据\\房源数据\\南京房源数据${pageIndex}.xlsx", data, "房源") -////// data = [] -////// data << title -////// pageIndex++ -////// } -//////} -//////if(data.size() > 0){ -////// ExcelUtils.write("E:\\数据\\房源数据\\南京房源数据${pageIndex}.xlsx", data, "房源") -//////} -//////new File("E:\\数据\\房源数据\\统计局房源").eachFile {def file-> -////// def data = ExcelUtils.read(file.getAbsolutePath(),0,0) -////// data.each {List item-> -////// item.remove(14) -////// } -////// ExcelUtils.write(file.getAbsolutePath().replaceAll("统计局房源","统计局房源01"),data,"房源") -////// println(file.getAbsolutePath()) -//////} -////// -//////DBCollection district = MongoUtils.getCollectionByName("business", "district", "192.168.0.136") -//////def regions = district.distinct("region",new BasicDBObject()) -//////def discardDistrict = [] -//////regions.each {def region-> -////// def count = district.count(new BasicDBObject("city","南京").append("region", region)) -////// def limit = (int)(count * 0.66) -////// district.find(new BasicDBObject("city","南京").append("region", region)).sort(new BasicDBObject("size",1)).limit(limit).each {BasicDBObject dbo-> -////// discardDistrict << "${dbo.city}#${dbo.region}#${dbo.name}" -////// } -//////} -//////println(discardDistrict.size()) -//////discardDistrict.each { -////// println(it) -//////} -////// -//////def files = [] -//////new File("E:\\数据\\房源数据\\统计局房源03").eachFile { -////// files << it.getName() -//////} -//////new File("E:\\数据\\房源数据\\统计局房源02").eachFile {def file-> -////// if(file.getAbsolutePath().contains("南京") && !files.contains(file.getName())){ -////// def data = ExcelUtils.read(file.getAbsolutePath(), 0 ,0) -////// def data01 = [] -////// data.each {List item-> -////// def k = "${item[0]}#${item[1]}#${item[2]}" -////// if(!discardDistrict.contains(k)){ -////// data01 << item -////// } -////// } -////// ExcelUtils.write(file.getAbsolutePath().replaceAll("统计局房源02","统计局房源03"),data01,"房源") -////// println(file.getAbsolutePath()) -////// } -//////} -//////DBCollection db136 = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com") -//////ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Downloads\\兴业银行数据样本.xlsx",{List item-> -////// def city = item[0] -////// def name = item[1] -////// def addr = item[2] -////// if(StringUtils.isNotBlank(city)){ -////// JSONObject matchResult = null -////// if(StringUtils.isNotBlank(name) && name.length() > 2){ -////// matchResult = OpenApiClient.addressMatch(city, name, "district") -////// } -////// if(matchResult == null || !matchResult.containsKey("name")){ -////// matchResult = OpenApiClient.addressMatch(city, addr, "district") -////// } -////// -////// if(matchResult!= null && matchResult.containsKey("name")){ -////// item[3] = matchResult.getString("city") -////// item[4] = matchResult.getString("district") -////// item[5] = matchResult.getString("name") -////// item[6] = OpenApiClient.queryDistrictAvgPrice(item[3], item[4], item[5]) -////// if(item[6] == 0){ -////// item[6] = null -////// } -////// def result = getHouseArea(item[3], item[4], item[5]) -////// if(result){ -////// item[7] = result.max -////// item[8] = result.min -////// item[9] = result.many -////// item[10] = result.avg -////// } -////// def one = db136.findOne(new BasicDBObject("city", item[3]).append("region", item[4]).append("district_name",item[5])) -////// if(one){ -////// item[11] = one.around_catering_consumption -////// } -////// } -////// println(item) -////// } -//////}) -//// -//////def getHouseArea(String city, String region, String name){ -////// -////// def query = new BasicDBObject() -////// query.append("city", city) -////// query.append("region", region) -////// def ks = [] -////// ks << name -////// if(name ==~ /.*[东南西北一二三四五六七八九十\d](期|区)$/){ -////// ks << name.replaceAll('[东南西北一二三四五六七八九十\\d](期|区)$', "").replace("~","-") -////// } -////// BasicDBObject one = DbUtils.seaweed.findOne(new BasicDBObject("city", city).append("region", region).append("name",name).append("cat","district").append("visible", 0), new BasicDBObject("alias", 1)) -////// if(one && one.alias){ -////// List alias = one.alias -////// alias.each { -////// if(it && it.length() > 2){ -////// ks << it -////// } -////// } -////// } -////// ks.unique() -////// BooleanQuery nameQuery = new BooleanQuery(); -////// for(String k : ks){ -////// nameQuery.add(new TermQuery(new Term("district_name", k.replaceAll("\\)|\\(|(|)|、",""))), BooleanClause.Occur.SHOULD); -////// } -////// query.append("cat", "sell") -////// def map = [:] -////// def max = Double.MIN_VALUE -////// def min = Double.MAX_VALUE -////// DbUtils.seabird.find(query.append('$sr', new BasicDBObject('sr.query',nameQuery.toString())), new BasicDBObject("area", 1)).batchSize(500).each {BasicDBObject dbo -> -////// if(dbo.area){ -////// map[dbo.area] = map.get(dbo.area, 0) + 1 -////// if(dbo.area > max){ -////// max = dbo.area -////// } -////// if(dbo.area < min){ -////// min = dbo.area -////// } -////// -////// } -////// } -////// def count = 0; -////// def area -////// map.each {Double k, int v -> -////// if(v > count){ -////// count = v; -////// area = k -////// } -////// } -////// -////// long totalArea = 0 -////// long count1 = 0 -////// map.each {Double k, int v-> -////// totalArea = totalArea + (k * v) -////// count1 = count1 + v -////// } -////// if(count > 0){ -////// def result = [:] -////// result.many = area?.toString().toDouble().toInteger() -////// result.min = min -////// result.max = max -////// result.avg = (totalArea/count1).toInteger() -////// return result -////// } -////// return null -//////} -//////ExcelUtils.modify("D:\\Users\\wenyan\\Downloads\\绿地房产项目.xlsx",{List dbo-> -////// def cities = CommonUtils.findAllCity() -////// String addr = dbo[0] -////// def city = null -////// for(def c : cities){ -////// if(addr.startsWith("c" + "市")){ -////// city = c; -////// break -////// } -////// } -////// if(city == null){ -////// for(def c : cities){ -////// if(addr.startsWith("c")){ -////// city = c; -////// break -////// } -////// } -////// } -////// if(city == null){ -////// for(def c : cities){ -////// if(addr.contains(c)){ -////// city = c; -////// break -////// } -////// } -////// } -////// if(city == null){ -////// city = "上海" -////// } -////// JSONObject match = OpenApiClient.addressMatch(city, addr,null,false) -////// if(match && match.containsKey("district")){ -////// dbo[1] = match.getString("city") -////// dbo[2] = match.getString("district") -////// dbo[3] = match.getString("name") -////// int avgPrice = OpenApiClient.queryDistrictAvgPrice(dbo[1],dbo[2],dbo[3]) -////// if(avgPrice != 0){ -////// dbo[4] = avgPrice -////// } -////// } -////// println(dbo) -//////}) -//////def date = Date.parse("yyyyMMdd","20160301") -//////ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\已精耕城市列表.xlsx").each { -////// if(it[1] != null){ -////// int count = 0 -////// DbUtils.seaweed.find(new BasicDBObject("city", it[1]).append("cat", "district").append("source","machine"), new BasicDBObject("c_date",1)).each {BasicDBObject dbo-> -////// Date cDate = dbo.c_date -////// if(cDate && cDate.after(date)){ -////// count ++ -////// } -////// } -////// DbUtils.seaweed.find(new BasicDBObject("city", it[1]).append("cat", "district").append("source","map"), new BasicDBObject("c_date",1)).each {BasicDBObject dbo-> -////// Date cDate = dbo.c_date -////// if(cDate && cDate.after(date)){ -////// count ++ -////// } -////// } -////// if(count > 0){ -////// println("${it[1]} ${count}") -////// } -////// } -//////} -//// -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\绿地房产项目.xlsx",{List item-> -////// DBCollection coll = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") -////// if(item[4]){ -////// def dbo = coll.findOne(new BasicDBObject("city",item[1]).append("region", item[2]).append("district_name", item[3]).append("weekend",Date.parse("yyyyMMdd","20160626"))) -////// item[5] = dbo.credit -////// } -////// -//////}) -////// -//////DBCollection coll = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") -//////def xianRegion = [] -//////coll.find(new BasicDBObject("ranking_level","县级市")).each { -////// xianRegion << it.name -//////} -//////println(xianRegion.size()) -//////def allCity = RegionData.allCity -//////def allRegion = [:] -//////for(def c : allCity){ -////// for(def r :RegionData.getAllRegions(c).keySet()){ -////// if(xianRegion.contains(r)){ -////// allRegion.get(r,[]) << c -////// } -////// } -//////} -//////allRegion.each {String k,List v-> -////// if(v.size() > 1){ -////// println("${k} ${v}") -////// } -//////} -////// -//////CommonUtils.findAllCity().each {def city-> -////// DbUtils.executeQueryOnSeaweed(new BasicDBObject("city", city).append("cat", "district").append("visible", 0),{BasicDBObject dbo-> -////// String name = dbo.getString("name") -////// if(name ==~ /^\s+.*/ || name ==~ /.*\s+$/){ -////// println(name) -////// name = name.replaceAll("^\\s+", "").replaceAll("\\s+\$", ""); -////// DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', new BasicDBObject("name", name.replaceAll("\\s", "")))) -////// println(name) -////// } -////// }, new BasicDBObject("region", 1).append("name",1)) -//////} -//// -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\绿地项目人工匹配的住宅-补充价格.xlsx",{List row-> -////// def params = new HashMap() -////// params.city = row[2] -////// params.region = row[3] -////// params.name = row[4] -////// if(row[4].toString().contains("别墅")){ -////// params.estateType = "别墅" -////// }else{ -////// params.estateType = "普通住宅" -////// } -////// JSONObject respo = HttpRequestUtil.getJsonContent("http://192.168.10.66:8092/calc", params) -////// row[5] = respo?.value -////// row[7] = respo?.credit -////// println(row) -//////}) -//////def HOST = "coredata.mongo.db.fangjia.com" -//////DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("coredata", "analy_site", HOST, 27017) -//////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\待处理量.xlsx",{List data-> -////// def query = new BasicDBObject(); -////// query.append("cat", "district") -////// query.append("data_status",0) -////// query.append("exists", 0) -////// query.append("city", data[2]) -////// data[3] = ANALY_SITE_COLL.count(query) -////// println(data) -//////}) -//// -//////DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", MongoUtils.FANGJIA_ONLINE_MONGO, 27017) -//////ANALY_SITE_COLL.find().sort(new BasicDBObject("name", 1)).each {BasicDBObject dbo-> -////// if(dbo.display != "全国"){ -////// println("${dbo.display}") -////// } -//////} -Jms __jms = Jms.create('tcp://monitor.jms.db.fangjia.com:61616') -__jms.sendSms("13916076378","Hello World", false) -__jms.sendSms("13916076378","Hello World", false) -__jms.sendSms("13916076378","Hello World", false) -__jms.sendSms("13916076378","Hello World", false) -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\存量客户统计表汇总结果-文艳导出.xlsx",{List item-> -////// def city = item[8] -////// def region = item[9] -////// def name = item[10] -////// def size = item[16] -////// if(size && name){ -////// JSONArray result = OpenApiClient.historyEvaluate(city, region, name, "monthly", "13", size) -////// if(result.size() == 13){ -////// item[18] = result.getJSONObject(12).getInt("totalPrice") - result.getJSONObject(0).getInt("totalPrice") -////// item[19] = DataUtil.roundDouble(((result.getJSONObject(12).getInt("totalPrice") - result.getJSONObject(0).getInt("totalPrice")) * 100)/result.getJSONObject(0).getInt("totalPrice"),2) -////// int i = 20 -////// for(int j = 1; j < result.size(); j++){ -////// item[i++] = result.getJSONObject(j).getDouble("changePercent") -////// } -////// } -////// } -////// println(item) -//////}) -//////DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("business", "city_officer", "192.168.0.136", 27017) -//////ANALY_SITE_COLL.drop() -//////def data = ExcelUtils.read("e:\\Users\\wenyan\\Desktop\\城市对接人(3).xlsx") -//////data.each {List item-> -////// def dbo = new BasicDBObject() -////// dbo.append("level", item[1]) -////// dbo.append("city", item[2]) -////// dbo.append("user_name", item[3]) -////// dbo.append("manager", item[4]) -////// ANALY_SITE_COLL.save(dbo) -//////} -////// -////////CommonUtils.sendDingMsgByCity("北京","Hello World!") -////// -//////OpenApiClient.addressMatch("上海","呼玛三村","district") -//////OpenApiClient.addressMatch("上海","呼玛三村","district") -//////OpenApiClient.flushCache("上海") -//////OpenApiClient.addressMatch("上海","呼玛三村","district") -//////new File("E:\\Users\\wenyan\\Desktop\\门牌号新版").eachFile {def file-> -////// def data = CsvUtils.read(file.getAbsolutePath()) -////// data.each {def item-> -////// def addr = "" -////// if(StringUtils.isNotBlank(item[3])){ -////// addr += item[3] -////// } -////// if(StringUtils.isNotBlank(item[4])){ -////// addr += item[4] -////// } -////// if(StringUtils.isNotBlank(item[5])){ -////// addr += item[5] -////// } -////// item[13] = addr -////// } -////// data.set(0, ["USER_TYPE","REGION","CITY","ADDR1","ADDR2","ADDR3","YHS","RCS","MAX_RSC","FJS","BT_FJS","MAX_FJS","LINE","ALL_ADDR"]) -////// CsvUtils.write("E:\\Users\\wenyan\\Desktop\\门牌号新版2\\" + file.getName(),data) -////// println(file.getAbsolutePath()) -//////} -//////DBCollection MAP_COLL = MongoUtils.getCollectionByName("fangjia_tmp", "mapdata", "192.168.0.61", 27017) -//////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0).append("city", "温州"),{BasicDBObject dbo-> -////// def city = dbo.getString("city") -////// def name = dbo.getString("name") -////// def query = new BasicDBObject() -////// query.append("city", city) -////// def or = [new BasicDBObject("name", name)] -////// if(dbo.alias){ -////// for(String alia : dbo.alias){ -////// if(alia != null && alia.length() > 2){ -////// or << new BasicDBObject("name", alia) -////// } -////// } -////// } -////// query.append('$or', or) -////// def regions = [] -////// def addrs = [] -////// MAP_COLL.find(query).each {BasicDBObject map-> -////// if(map.format_region && !regions.contains(map.format_region)){ -////// regions << map.format_region -////// addrs << map.addr -////// } -////// } -////// if(regions.size() > 0 && !regions.contains(dbo.region)){ -////// println("${dbo.city}\t${dbo.region}\t${name}\t${regions.join(',')}\t${addrs.join(",")}\t${findRegionInGaoDe(city, name)}") -////// } -//////},new BasicDBObject("city", 1).append("region",1).append("name",1).append("alias", 1)) -////// -////// -//////def findRegionInGaoDe(String city, String name){ -////// def pois = KeywordSearchUtils.searchKeywordByGaodeApiAll(city, name) -////// def regions = [] -////// def addrs = [] -////// for(Poi poi: pois){ -////// if(poi.orgName.replace('·',"") == name || poi.name == name){ -////// regions << poi.region -////// addrs << poi.address -////// } -////// } -////// regions.unique() -////// return regions.join(",") + "\t" + addrs.join(",") -//////} -//// -//////def data = ExcelUtils.read("e:\\Users\\wenyan\\Desktop\\城市列表.xlsx") -//////def citys = [] -//////data.each { -////// citys << it[0] -//////} -//////def randomCities = [] -//////Random random = new Random() -//////while (randomCities.size() <= 50){ -////// int index = random.nextInt(140) -////// def c = citys[index] -////// if(!randomCities.contains(c)){ -////// randomCities << c -////// } -//////} -////// -//////def houseData = [] -//////houseData << ["省","市","区","小区名称","产证地址","面积","楼层","总楼层","建成年代"] -//////int total = 0 -//////for(String city : randomCities){ -////// Iterator cursor = DbUtils.seabird.find(new BasicDBObject("city", city.replaceAll('市$', '')).append("cat", "sell")).limit(random.nextInt(200)).iterator() -////// while (cursor.hasNext()){ -////// BasicDBObject dbo= cursor.next() -////// def item = [null, city, dbo.region, dbo.district_name, dbo.address, dbo.area, dbo.floor, dbo.height, dbo.build_date.toString() ==~ /\d{4}年/?dbo.build_date:null] -////// houseData << item -////// if(houseData.size() >= 2000){ -////// break -////// } -////// } -////// if(houseData.size() >= 2000){ -////// break -////// } -//////} -//////ExcelUtils.write("e:\\Users\\wenyan\\Desktop\\房源.xlsx", houseData, "结果") -//////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap", "192.168.0.61", 27017) -//////DBCollection MAP_COLL = MongoUtils.getCollectionByName("fangjia_tmp", "mapdata", "192.168.0.61", 27017) -//////def citys =["鸡西","吉安","商洛","延安","玉林","枣庄","张家界","绵阳","晋中","濮阳","渭南","乌兰察布","漯河","辽阳","眉山","宝鸡","新余","阳泉","漳州","绥化","南宁","乌海","遂宁","盐城","延边","池州","平凉","六安","五指山","扬州","西安","攀枝花","武威","黄山","三门峡","南阳","沈阳","杭州","抚顺","厦门","内江","盘锦","无锡","宁波","西宁","大理","拉萨","泰州","天门","赤峰","阿里","威海","齐齐哈尔","定西","菏泽","连云港","泰安","通化","万宁","文昌","阜阳","百色","安庆","宜昌","巴中","秦皇岛","清远","庆阳","潜江","固原","铜仁","成都","湘潭","太原","镇江","安顺","景德镇","神农架","琼中","黔西南","济源","兰州","青岛","宿迁","赣州","朝阳","长沙","株洲","昭通","潍坊","临沧","襄阳","资阳","湘潭","太原","来宾","吉林","中山","阿拉善盟","乌鲁木齐","锦州","九江","广元","白山","永州","临汾","钦州","石家庄","韶关","铁岭","郑州","怒江州","伊犁","林芝","咸阳","济南","营口","克孜勒苏","昌都","凉山州","临高","临夏","六盘水","南京","吕梁","梅州","湘西","南通","北京","黄冈","白沙","兴安盟","锡林郭勒盟","佛山","温州","芜湖","肇庆","焦作","宣城","舟山","巴音郭楞","双鸭山","湛江","和田","博尔塔拉","云浮","吐鲁番","阿勒泰","大兴安岭","东方","东莞","恩施","防城港","甘孜州","三明","四平","福州","本溪","桂林","果洛州","武汉","玉树州","黄南州","唐山","大连","昆明","临沂","崇左","贵阳","大同","黄石","黔南","山南","佳木斯","保定","烟台佳木斯","保定","烟台"] -//////ExcelUtils.multiThreadingModify("e:\\Users\\wenyan\\Desktop\\地图库待处理量.xlsx",{List item-> -////// if(citys.contains(item[2])){ -////// item[5] = BAIDU_MAP_COLL.count(new BasicDBObject("cat", "district").append("city", item[2]).append("status","未审核")) -////// item[6] = BAIDU_MAP_COLL.count(new BasicDBObject("cat", "district").append("city", item[2]).append("status","区域错误")) -////// item[7] = MAP_COLL.count(new BasicDBObject("city", item[2])) -////// } -//////}) -//////ExcelUtils.multiThreadingModify("e:\\Users\\wenyan\\Desktop\\众拍.xlsx",{List item-> -////// String city = item[1] -////// String region = item[2] -////// String name = item[3] -////// JSONObject resp = OpenApiClient.addressMatch(city , name, "district", false, region) -////// if(resp.getDouble("credit") > 0.5){ -////// item[6] = resp.city -////// item[7] = resp.district -////// item[8] = resp.name -////// -////// } -//////}) -//// -//// -/////* -////DBCollection dealPrice = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") -////Calendar calendar = Calendar.getInstance() -////calendar.setTime(com.fangjia.core.util.DateUtil.parseDate("20160501", "yyyyMMdd")) -////for(int i = 0 ; i < 3; i++){ -//// def startDate = calendar.getTime() -//// calendar.add(Calendar.MONTH, 1) -//// def endDate = calendar.getTime() -//// def citys = ["杭州","成都","深圳"] -//// citys.each {def city-> -//// def query = new BasicDBObject() -//// query.append("city", city) -//// query.append("trade_date", new BasicDBObject('$gte', startDate).append('$lt', endDate)) -//// println("${startDate.format("MM")} ${city} ${dealPrice.count(query)}") -//// } -//// -////}*/ -//////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap", "192.168.0.61", 27017) -//////DBCollection MAP_COLL = MongoUtils.getCollectionByName("fangjia_tmp", "mapdata", "192.168.0.61", 27017) -//////def citys =["通辽","呼伦贝尔","酒泉","常州","宜宾","衢州","梧州","淮北","哈尔滨","鸡西","吉安","商洛","延安","玉林","枣庄","张家界","绵阳","晋中","濮阳","渭南","乌兰察布","漯河","辽阳","眉山","宝鸡","新余","阳泉","漳州","绥化","南宁","乌海","遂宁","盐城","延边","池州","平凉","六安","五指山","扬州","西安","攀枝花","武威","黄山","三门峡","南阳","沈阳","杭州","抚顺","厦门","内江","盘锦","无锡","宁波","西宁","大理","拉萨","泰州","天门","赤峰","阿里","威海","齐齐哈尔","定西","菏泽","连云港","泰安","通化","万宁","文昌","阜阳","百色","安庆","宜昌","巴中","秦皇岛","清远","庆阳","潜江","固原","铜仁","成都","湘潭","太原","镇江","安顺","景德镇","神农架","琼中","黔西南","济源","兰州","青岛","宿迁","赣州","朝阳","长沙","株洲","昭通","潍坊","临沧","襄阳","资阳","湘潭","太原","来宾","吉林","中山","阿拉善盟","乌鲁木齐","锦州","九江","广元","白山","永州","临汾","钦州","石家庄","韶关","铁岭","郑州","怒江州","伊犁","林芝","咸阳","济南","营口","克孜勒苏","昌都","凉山州","临高","临夏","六盘水","南京","吕梁","梅州","湘西","南通","北京","黄冈","白沙","兴安盟","锡林郭勒盟","佛山","温州","芜湖","肇庆","焦作","宣城","舟山","巴音郭楞","双鸭山","湛江","和田","博尔塔拉","云浮","吐鲁番","阿勒泰","大兴安岭","东方","东莞","恩施","防城港","甘孜州","三明","四平","福州","本溪","桂林","果洛州","武汉","玉树州","黄南州","唐山","大连","昆明","临沂","崇左","贵阳","大同","黄石","黔南","山南","佳木斯","保定","烟台佳木斯","保定","烟台","许昌","邯郸","辽源","洛阳","淄博","廊坊","鹤岗","宿州","七台河","泸州","雅安","汉中","开封","张掖","白银","黑河","呼和浩特","晋城","朔州","银川","阿坝州","德宏州","广州","海东","信阳","鞍山","楚雄","海西州","白城", "上饶","驻马店","北海","亳州","海北州","铜川","喀什","日照","石嘴山","毕节","安阳","南平","苏州","抚州","衡水", "宁德","榆林","中卫","河池","滨州","商丘","五家渠","澄迈","定安","儋州","汕头","龙岩","海口","宜春","沧州","广安", "孝感","河池","淮安","珠海","马鞍山","嘉兴","海南州","上海","周口","阳江","丹东","保山","遵义","益阳","滁州","莆田","文山州","安康","蚌埠","保亭","德州","河源","鹤壁","伊春","鄂州","嘉峪关","金昌","郴州", "深圳","贺州","新乡","红河","克拉玛依","茂名","天津","运城","那曲","阿拉尔","昌江","包头","荆门","淮南","揭阳","鄂尔多斯","汕尾","东营","潮州","咸宁","甘南","徐州","荆州","三亚","天水","南昌","南充","迪庆州","衡阳","西双版纳州","石河子","仙桃","琼海","陵水","金华","葫芦岛","日喀则","哈密","图木舒克","乐东","屯昌","德阳","萍乡","自贡","十堰","承德","张家口","普洱","乐山", "平顶山","巴彦淖尔","鹰潭","莱芜","铜陵","达州","松原","贵港","邢台","忻州","吴忠","阜新","绍兴","济宁","昌吉","黔东南","合肥","随州","陇南","娄底","阿克苏","柳州","塔城","湖州","惠州","丽江","长治","聊城","丽水","邵阳","常德","重庆","岳阳","泉州", "台州","牡丹江","大庆" ,"长春","江门","曲靖","怀化","玉溪"] -//////ExcelUtils.multiThreadingModify("E:\\房价网\\201507\\地图库待处理量.xlsx",{List item-> -////// if(citys.contains(item[2])){ -////// item[5] = BAIDU_MAP_COLL.count(new BasicDBObject("cat", "district").append("city", item[2]).append("status","未审核")) -////// item[6] = BAIDU_MAP_COLL.count(new BasicDBObject("cat", "district").append("city", item[2]).append("status","区域错误")) -////// item[7] = MAP_COLL.count(new BasicDBObject("city", item[2])) -////// } -//////}) -//////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap", "192.168.0.61", 27017) -//////DBCollection MAP_COLL = MongoUtils.getCollectionByName("fangjia_tmp", "mapdata", "192.168.0.61", 27017) -//////def citys =["常州","宜宾","衢州","梧州","淮北","哈尔滨","鸡西","吉安","商洛","延安","玉林","枣庄","张家界","绵阳","晋中","濮阳","渭南","乌兰察布","漯河","辽阳","眉山","宝鸡","新余","阳泉","漳州","绥化","南宁","乌海","遂宁","盐城","延边","池州","平凉","六安","五指山","扬州","西安","攀枝花","武威","黄山","三门峡","南阳","沈阳","杭州","抚顺","厦门","内江","盘锦","无锡","宁波","西宁","大理","拉萨","泰州","天门","赤峰","阿里","威海","齐齐哈尔","定西","菏泽","连云港","泰安","通化","万宁","文昌","阜阳","百色","安庆","宜昌","巴中","秦皇岛","清远","庆阳","潜江","固原","铜仁","成都","湘潭","太原","镇江","安顺","景德镇","神农架","琼中","黔西南","济源","兰州","青岛","宿迁","赣州","朝阳","长沙","株洲","昭通","潍坊","临沧","襄阳","资阳","湘潭","太原","来宾","吉林","中山","阿拉善盟","乌鲁木齐","锦州","九江","广元","白山","永州","临汾","钦州","石家庄","韶关","铁岭","郑州","怒江州","伊犁","林芝","咸阳","济南","营口","克孜勒苏","昌都","凉山州","临高","临夏","六盘水","南京","吕梁","梅州","湘西","南通","北京","黄冈","白沙","兴安盟","锡林郭勒盟","佛山","温州","芜湖","肇庆","焦作","宣城","舟山","巴音郭楞","双鸭山","湛江","和田","博尔塔拉","云浮","吐鲁番","阿勒泰","大兴安岭","东方","东莞","恩施","防城港","甘孜州","三明","四平","福州","本溪","桂林","果洛州","武汉","玉树州","黄南州","唐山","大连","昆明","临沂","崇左","贵阳","大同","黄石","黔南","山南","佳木斯","保定","烟台佳木斯","保定","烟台","许昌","邯郸","辽源","洛阳","淄博","廊坊","鹤岗","宿州","七台河","泸州","雅安","汉中","开封","张掖","白银","黑河","呼和浩特","晋城","朔州","银川","阿坝州","德宏州","广州","海东","信阳","鞍山","楚雄","海西州","白城", "上饶","驻马店","北海","亳州","海北州","铜川","喀什","日照","石嘴山","毕节","安阳","南平","苏州","抚州","衡水", "宁德","榆林","中卫","河池","滨州","商丘","五家渠","澄迈","定安","儋州","汕头","龙岩","海口","宜春","沧州","广安", "孝感","河池","淮安","珠海","马鞍山","嘉兴","海南州","上海","周口","阳江","丹东","保山","遵义","益阳","滁州","莆田","文山州","安康","蚌埠","保亭","德州","河源","鹤壁","伊春","鄂州","嘉峪关","金昌","郴州", "深圳","贺州","新乡","红河","克拉玛依","茂名","天津","运城","那曲","阿拉尔","昌江","包头","荆门","淮南","揭阳","鄂尔多斯","汕尾","东营","潮州","咸宁","甘南","徐州","荆州","三亚","天水","南昌","南充","迪庆州","衡阳","西双版纳州","石河子","仙桃","琼海","陵水","金华","葫芦岛","日喀则","哈密","图木舒克","乐东","屯昌","德阳","萍乡","自贡","十堰","承德","张家口","普洱","乐山", "平顶山","巴彦淖尔","鹰潭","莱芜","铜陵","达州","松原","贵港","邢台","忻州","吴忠","阜新","绍兴","济宁","昌吉","黔东南","合肥","随州","陇南","娄底","阿克苏","柳州","塔城","湖州","惠州","丽江","长治","聊城","丽水","邵阳","常德","重庆","岳阳","泉州", "台州","牡丹江","大庆" ,"长春","江门","曲靖","怀化","玉溪"] -//////ExcelUtils.multiThreadingModify("E:\\房价网\\201507\\地图库待处理量.xlsx",{List item-> -////// if(citys.contains(item[2])){ -////// item[5] = BAIDU_MAP_COLL.count(new BasicDBObject("cat", "district").append("city", item[2]).append("status","未审核")) -////// item[6] = BAIDU_MAP_COLL.count(new BasicDBObject("cat", "district").append("city", item[2]).append("status","区域错误")) -////// item[7] = MAP_COLL.count(new BasicDBObject("city", item[2])) -////// } -//////}) -//////DBCollection dealPrice = MongoUtils.getCollectionByName("fangjia", "deal_price", "mongo.db.fangjia.com") -//////Calendar calendar = Calendar.getInstance() -//////calendar.setTime(com.fangjia.core.util.DateUtil.parseDate("20160501", "yyyyMMdd")) -//////for(int i = 0 ; i < 3; i++){ -////// def startDate = calendar.getTime() -////// calendar.add(Calendar.MONTH, 1) -////// def endDate = calendar.getTime() -////// def citys = ["杭州","成都","深圳"] -////// citys.each {def city-> -////// def query = new BasicDBObject() -////// query.append("city", city) -////// query.append("trade_date", new BasicDBObject('$gte', startDate).append('$lt', endDate)) -////// println("${startDate.format("MM")} ${city} ${dealPrice.count(query)}") -////// } -//////} -/////*ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\憨分科技(1)-补充小区.xls",{List data-> -//// def city = data[2] -//// def region = data[3] -//// def addr = data[4] -//// def oldMatchRegion = data[5] -//// def oldMatchName = data[6] -//// JSONObject resp= OpenApiClient.addressMatch(city, addr, null, false, region, "strict") -//// if(resp.getDouble("credit") > 0){ -//// data[7] = resp.district -//// data[8] = resp.name -//// }else{ -//// data[7] = null -//// data[8] = null -//// } -//// if(oldMatchRegion == data[7] && oldMatchName == data[8]){ -//// data[9] = "一致" -////======= -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\憨分科技(1)-补充小区.xls",{List data-> -////// def city = data[2] -////// def region = data[3] -////// def addr = data[4] -////// def oldMatchRegion = data[5] -////// def oldMatchName = data[6] -////// JSONObject resp= OpenApiClient.addressMatch(city, addr, null, false, region, "strict") -////// if(resp.getDouble("credit") > 0){ -////// data[7] = resp.district -////// data[8] = resp.name -////// }else{ -////// data[7] = null -////// data[8] = null -////// } -////// if(oldMatchRegion == data[7] && oldMatchName == data[8]){ -////// data[9] = "一致" -////// }else{ -////// data[9] = "不一致" -////// } -////// println(data) -//////}) -////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\地图地址比较.xlsx",{List data-> -//// HttpRequest request = new HttpRequest() -//// def params = [city:data[0], region:data[1], name:data[2]] -//// JSONObject json = request.getJsonContent("http://192.168.10.88/mapSearch/findOptimal", params, "UTF-8") -//// if(json){ -//// JSONObject result = json.getJSONObject("result") -//// if(result.containsKey("baiduMapPoi")){ -//// JSONObject baiduMapPoi = result.getJSONObject("baiduMapPoi") -//// data[4] = baiduMapPoi.region -//// data[5] = baiduMapPoi.name -//// data[6] = baiduMapPoi.address -//// } -//// if(result.containsKey("gaodeMapPoi")){ -//// JSONObject gaodeMapPoi = result.getJSONObject("gaodeMapPoi") -//// data[7] = gaodeMapPoi.region -//// data[8] = gaodeMapPoi.name -//// data[9] = gaodeMapPoi.address -//// } -//// if(result.containsKey("tencentMapPoi")){ -//// JSONObject tencentMapPoi = result.getJSONObject("tencentMapPoi") -//// data[10] = tencentMapPoi.region -//// data[11] = tencentMapPoi.name -//// data[12] = tencentMapPoi.address -//// } -//// } -//// Thread.sleep(200) -//// println(data) -//// -////}) -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\帮忙调查房价是否正确.xlsx", {List data-> -////// data[5] = DbUtils.seaweed.findOne(new BasicDBObject("city",data[1]).append("region", data[2]).append("name", data[3]).append("visible",0).append("cat","district"),new BasicDBObject("address",1))?.address -////// println(data) -//////}) -//// -////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat", "district").append("visible", 0),{BasicDBObject dbObject-> -//// if(dbObject.address && dbObject.getString("address").startsWith("路")){ -//// dbObject.removeField("_id") -//// println(dbObject) -////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap", "192.168.0.61", 27017) -////BAIDU_MAP_COLL.find(new BasicDBObject("cat", "district").append("status","未审核")).each {BasicDBObject dbo-> -//// def city = dbo.city -//// def name = dbo.name -//// if(findDistrict(city,name) != null){ -//// dbo.append("cpdbStatus", "区域不一致") -//// }else{ -//// dbo.append("cpdbStatus", "CPDB库不存在") -//// } -////},new BasicDBObject("address",1).append("name", 1).append("city", 1).append("region",1)) -////<<<<<<< HEAD -//// println(data) -////}) -//// BAIDU_MAP_COLL.save(dbo) -////}*/ -//// -//////DBCollection AAA = MongoUtils.getCollectionByName("addrepo", "baidumap", "localhost", 27017) -//////def data = [] -////// -//////data << new BasicDBObject("_id", "2222222") -//////data << new BasicDBObject("_id", "2222222") -//////data << new BasicDBObject("_id", "2222222") -//////data << new BasicDBObject("_id", "3333333") -//////data << new BasicDBObject("_id", "3333333") -//////data << new BasicDBObject("_id", "3333333") -//////data << new BasicDBObject("_id", "3333333") -//////data << new BasicDBObject("_id", "1111111").append("k", 'kkkk') -////// -//////AAA.insert(data, WriteConcern.SAFE)*/ -//////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\地图地址比较.xlsx",{List data-> -////// HttpRequest request = new HttpRequest() -////// def params = [city:data[0], region:data[1], name:data[2]] -////// JSONObject json = request.getJsonContent("http://192.168.10.88/mapSearch/findOptimal", params, "UTF-8") -////// if(json){ -////// JSONObject result = json.getJSONObject("result") -////// if(result.containsKey("baiduMapPoi")){ -////// JSONObject baiduMapPoi = result.getJSONObject("baiduMapPoi") -////// data[4] = baiduMapPoi.region -////// data[5] = baiduMapPoi.name -////// data[6] = baiduMapPoi.address -////// } -////// if(result.containsKey("gaodeMapPoi")){ -////// JSONObject gaodeMapPoi = result.getJSONObject("gaodeMapPoi") -////// data[7] = gaodeMapPoi.region -////// data[8] = gaodeMapPoi.name -////// data[9] = gaodeMapPoi.address -////// } -////// if(result.containsKey("tencentMapPoi")){ -////// JSONObject tencentMapPoi = result.getJSONObject("tencentMapPoi") -////// data[10] = tencentMapPoi.region -////// data[11] = tencentMapPoi.name -////// data[12] = tencentMapPoi.address -////// } -////// } -////// Thread.sleep(200) -////// println(data) -////// -//////}) -//////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\错误小区.xlsx",{List data-> -////// -////// if(data[5] == null || data[5] == data[1]){ -////// HttpRequest request = new HttpRequest() -////// def params = [city:data[0], region:data[1], name:data[2]] -////// JSONObject json = request.getJsonContent("http://192.168.10.88/mapSearch/findOptimal", params, "UTF-8") -////// if(json){ -////// JSONObject result = json.getJSONObject("result") -////// if(result.containsKey("gaodeMapPoi")){ -////// JSONObject gaodeMapPoi = result.getJSONObject("gaodeMapPoi") -////// data[5] = gaodeMapPoi.region -////// }else if(result.containsKey("tencentMapPoi")){ -////// JSONObject tencentMapPoi = result.getJSONObject("tencentMapPoi") -////// data[5] = tencentMapPoi.region -////// }else if(result.containsKey("baiduMapPoi")){ -////// JSONObject baiduMapPoi = result.getJSONObject("baiduMapPoi") -////// data[5] = baiduMapPoi.region -////// } -////// } -////// Thread.sleep(200) -////// println(data) -////// -////// } -//////}) -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\错误小区.xlsx",{List data-> -////// if(data[6] == "存在"){ -////// def city = data[0] -////// def region = data[1] -////// def name = data[2] -////// def one = DbUtils.seaweed.findOne(new BasicDBObject("city", city).append('region',region).append("name", name).append("visible", 0).append("cat", "district")) -////// if(one){ -////// DbUtils.seaweed.remove(new BasicDBObject("_id", one._id)) -////// println("$city $region $name") -////// } -////// } -//////}); -//////DBCollection REGION_STAT_TREND = MongoUtils.getCollectionByName("fangjia_stat", "region_sell_stat", "mongo.db.fangjia.com") -//////REGION_STAT_TREND.find().each { -////// println(it) -//////} -//////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("addrepo", "baidumap", "192.168.0.61", 27017) -//////List cities = BAIDU_MAP_COLL.distinct("city",new BasicDBObject("cat", "district") ) -//////cities.each {def city-> -////// BAIDU_MAP_COLL.find(new BasicDBObject("cat", "district").append("city",city)).each {BasicDBObject newDistrict-> -////// if(findDistrict(newDistrict.city, newDistrict.name) != null){ -////// newDistrict.append("cpdbStatus", "区域不一致") -////// }else{ -////// newDistrict.append("cpdbStatus", "CPDB库不存在") -////// } -////// if(newDistrict.address){ -////// newDistrict.address = newDistrict.getString("address").replaceAll("\\s", "") -////// } -////// println(newDistrict) -////// BAIDU_MAP_COLL.save(newDistrict) -////// } -//////} -////// -////// -////// -//////def BasicDBObject findDistrict(String city, String name){ -////// name = ClientUtils.escapeQueryChars(name) -////// BooleanQuery nameQuery = new BooleanQuery(); -////// nameQuery.add(new TermQuery(new Term("name", name)), BooleanClause.Occur.SHOULD); -////// nameQuery.add(new TermQuery(new Term("alias", name)), BooleanClause.Occur.SHOULD); -////// def query = new BasicDBObject("city", city).append('$sr', new BasicDBObject("sr.query", nameQuery.toString())).append("cat", "district").append("visible", 0); -////// return DbUtils.seaweed.findOne(query, new BasicDBObject("_id", 1)) -//////} -//////} -//////DBCollection BAIDU_MAP_COLL = MongoUtils.getCollectionByName("fangjia", "land_price", DbUtils.OFFLINE_MONGODB_DOMAIN, 27017) -//////def data = ExcelUtils.read("D:\\1.xlsx") -//////data.each {List item-> -////// def dbo = new BasicDBObject() -////// dbo.append("city", item[0]) -////// dbo.append("level", item[1]) -////// dbo.append("second_purpose", item[2]) -////// dbo.append("standard_land_price", item[3].toString().toDouble().toInteger()) -////// dbo.append("standard_date", item[4]) -////// dbo.append("volume_rate", item[5]) -////// dbo.append("develop_level", item[6]) -////// dbo.append("purpose","商业用途") -////// dbo.append("c_date", new Date()) -////// println(item) -////// BAIDU_MAP_COLL.save(dbo) -//////} -//////def log = new File("E:\\数据\\日志\\access.2016-09-27.log.1") -//////def logput = new File("E:\\数据\\日志\\access.2016-09-27.output.1") -//////def maxDate = DateUtil.parseDate("28/09/2016:07:00:00", "dd/MM/yyyy:HH:mm:ss") -//////def map = [:] -//////log.eachLine("UTF-8"){def line-> -////// def index = line.indexOf("[") -////// def end = line.indexOf(" +0800]",index) -////// def time = line.substring(index + 1 , end).replaceAll("Sep", "09") -////// def date = DateUtil.parseDate(time, "dd/MM/yyyy:HH:mm:ss") -////// if(maxDate.after(date) && line.indexOf("GET /statistic?__ajax=1") > 0){ -////// def ip = line.substring(0, line.indexOf(" - -")) -////// map[ip] = map.get(ip,0) + 1 -////// } -//////} -//////map.each {k,v-> -////// println("$k\t$v") -//////} -//////DBCollection DISTIRCT_RENT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", MongoUtils.FANGJIA_ONLINE_MONGO) -//////Date weekend = DateUtil.parseDate("2016-09-25", "yyyy-MM-dd") -//////def data = [] -//////data << ["城市","区域","名称","地址","百度经度","百度纬度","高德经度","高德纬度","户数","建筑面积","均价"] -//////DbUtils.executeQueryOnSeaweed(new BasicDBObject("cat","office").append("city","上海").append("region","长宁").append("visible", 0),{BasicDBObject dbo-> -////// def item = new ExcelRow() -////// item['A'] = dbo.city -////// item['B'] = dbo.region -////// item['C'] = dbo.name -////// item['d'] = dbo.address -////// if(dbo.lng2 && dbo.lat2){ -////// item['E'] = dbo.lng2/10000000000d -////// item['F'] = dbo.lat2/10000000000d -////// item['G'] = dbo.lng/10000000000d -////// item['H'] = dbo.lat/10000000000d -////// } -////// item['I'] = dbo.household_count -////// item['J'] = dbo.build_area -//////// def query = new BasicDBObject() -//////// query.append("city", dbo.city) -//////// query.append("region", dbo.region) -//////// query.append("district_name", dbo.name) -//////// query.append("weekend", weekend) -//////// def one = DISTIRCT_RENT.findOne(query) -//////// if(one){ -//////// item['K'] = one.avg_price -//////// } -////// println(item) -////// data << item -//////}) -//////ExcelUtils.write("E://需求数据.xlsx",data,"写字楼") -//////DbUtils.seawater.find(new BasicDBObject("city","上海").append("district_name","风伟二村").append("cat","sell")).each {BasicDBObject dbo-> -////// println(dbo._id) -//////} -//////DBCollection DISTIRCT_RENT = MongoUtils.getCollectionByName("fangjia", "seawater", "192.168.0.65", 27777) -//////DISTIRCT_RENT.find(new BasicDBObject("city","上海").append("district_name","风伟二村").append("cat","sell")).iterator().each {BasicDBObject dbo-> -////// println(dbo._id.toString()) -//////} -//////def findStr = "/autoComplete/suggest?cat=district&__ajax=1&keyword=" -//////def Pattern domainPattern = Pattern.compile("http://\\w+.fangjia.com/autoComplete/suggest") -//////def log = new File("E:\\数据\\日志\\抓取关键词.log") -//////def logs = new HashSet() -//////new File("E:\\数据\\日志\\access.2016-09-27.log.1").eachLine("UTF-8"){def line-> -////// if(line.contains("113.91.173.47")){ -////// def s = line.indexOf(findStr) -////// if(s > 0){ -////// def e = line.indexOf(" HTTP", s) -////// def keywords = line.substring(s + findStr.length(), e) -////// keywords = URLDecoder.decode(keywords, "UTF-8") -////// Matcher matcher = domainPattern.matcher(line) -////// if(matcher.find()){ -////// String result = keywords + "\t" + matcher.group().replaceAll("http://", "").replaceAll(".fangjia.com/autoComplete/suggest", "") -////// logs.add(result) -////// println(result) -////// } -////// } -////// } -//////} -//////new File("E:\\数据\\日志\\access.2016-09-26.log.1").eachLine("UTF-8"){def line-> -////// if(line.contains("113.91.173.47")){ -////// println(line) -//////// def s = line.indexOf(findStr) -//////// if(s > 0){ -//////// def e = line.indexOf(" HTTP", s) -//////// def keywords = line.substring(s + findStr.length(), e) -//////// keywords = URLDecoder.decode(keywords, "UTF-8") -//////// Matcher matcher = domainPattern.matcher(line) -//////// if(matcher.find()){ -//////// String result = keywords + "\t" + matcher.group().replaceAll("http://", "").replaceAll(".fangjia.com/autoComplete/suggest", "") -//////// logs.add(result) -//////// println(result) -//////// } -//////// } -////// } -//////} -//////logs.each { -////// log.append(it + "\n", "utf-8") -//////} -//// -//////DBCollection ANALY_SITE_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", MongoUtils.FANGJIA_ONLINE_MONGO, 27017) -//////def map = [:] -//////ANALY_SITE_COLL.find().sort(new BasicDBObject("name", 1)).each {BasicDBObject dbo-> -////// if(dbo.display != "全国"){ -////// map.put(dbo.name, dbo.display) -////// map.put(dbo.spell, dbo.display) -////// } -//////} -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\抓取数据分析.xlsx",{List item-> -////// def t = item[0] -////// item[0] = item[1] -////// item[1] = t -////// println(item) -//////}) -//////def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\抓取数据分析.xlsx") -//////def cache = [:] -//////data.each {List item-> -////// if(item[0] != null && item[2] == "存在"){ -////// cache[item[0]] = cache.get(item[0], 0) + 1 -////// } -//////} -//////cache.each {k,v-> -////// println("$k\t$v") -//////} -//////ExcelUtils.multiThreadingModify("E:\\Users\\wenyan\\Desktop\\益博睿经纬度.xlsx",{List item-> -////// String addr = item['B'] -////// if(StringUtils.isNotBlank(addr) && (addr.indexOf("号楼") > 0 && addr.indexOf("单元") > 0)){ -////// item['m'] = null -////// item['n'] = null -////// item['o'] = null -////// item['p'] = null -////// item['q'] = null -////// if(item['G'] != null){ -////// def c = item['G'].toString().replaceFirst("市","") -////// JSONObject resp = OpenApiClient.addressMatch(c, addr, null, true, null, "fuzzy") -////// if(resp.getDouble("credit") > 0){ -////// item['m'] = resp.name -////// item['n'] = resp.lng -////// item['o'] = resp.lat -////// def lng = item['N'] -////// def lat = item['o'] -////// if(lng && lat){ -////// def map = GeoUtils.geoconvBaiduToGoogle(lng, lat) -////// item['p'] = map['lng'] -////// item['q'] = map['lat'] -////// } -////// } -////// println(item) -////// } -////// -////// } -//////}) -//def list = [] -//ExcelUtils.read("D:\\Users\\wenyan\\Downloads\\常州江南银行住宅--更新ing.xls").each {List item-> -// list << "${item[1]}#${item[2]}" -//} -//def total = 1 -//DbUtils.executeQueryOnSeaweed(DbUtils.buildSeaweedQuery("常州"),{ BasicDBObject dbo-> -// def key = "${dbo.region}#${dbo.name}" -// if(list.contains(key)){ -// Map mark_map = dbo.mark_map -// if(!mark_map){ -// mark_map = [:] -// dbo.mark_map = mark_map -// } -// mark_map.isNanJingBank = 1 -// DbUtils.seaweed.save(dbo) -// total++ -// list.remove(key) -// }else { -// List alias = dbo.alias -// if(alias){ -// for(String alia : alias){ -// key = "${dbo.region}#${alia}" -// if(list.contains(key)){ -// Map mark_map = dbo.mark_map -// if(!mark_map){ -// mark_map = [:] -// dbo.mark_map = mark_map -// } -// mark_map.isNanJingBank = 1 -// DbUtils.seaweed.save(dbo) -// total++ -// list.remove(key) -// break -// } -// } -// } -// } -//}) -//////println(total) -//////list.each { -////// println(it) -//////} -//////DbUtils.seabird.find(new BasicDBObject("cat", "addr_district").append("keyword","翠绿山庄")).each { -////// println(it) -//////} -//////new File("\\\\192.168.0.135\\技术部\\access.2016-10-27.log").eachLine("utf-8"){def line-> -////// if(line.contains("500")){ -////// println(line) -////// } -//////} -//// -//////DbUtils.seabird.find(new BasicDBObject("cat", "addr_district")).each {BasicDBObject dbo-> -////// if(DbUtils.seaweed.count(new BasicDBObject("cat", "district").append("keyword", dbo.district_name).append("city", dbo.city)) == 0){ -////// println(dbo) -////// } -//////} -//////DbUtils.seaweed.find(new BasicDBObject("city", "张家口").append("cat", "district") -////// .append("c_date", new BasicDBObject('$gt',Date.parse("yyyyMMdd","20160830")).append('$lt', Date.parse("yyyyMMdd", "20160901")))).each { -////// println(it) -//////} -//// -//////DBCollection FANGJIA_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "192.168.0.136") -//////DBCollection TEMP = MongoUtils.getCollectionByName("fangjia_temp", "district_key", "192.168.0.136") -//////int count = 0 -//////def keys = new HashSet() -//////FANGJIA_STAT.find(new BasicDBObject(), new BasicDBObject("city", 1).append("name", 1).append("district_name" ,1)).batchSize(10000).sort(new BasicDBObject("_id", 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each {BasicDBObject dbo-> -////// String key = "${dbo.city}##${dbo.region}##${dbo.district_name}" -////// keys << key -////// count++ -////// if(count % 10000 == 0){ -////// println(count) -////// } -//////} -//////keys.each { -////// String[] parts = it.toString().split("##") -////// def query = new BasicDBObject() -////// query.append("city", parts[0] ) -////// query.append("region", parts[1]) -////// query.append("district_name", parts[2]) -////// TEMP.update(query, new BasicDBObject('$set', query), true, false) -//////} -//////int count = 0 -//////TEMP.find().batchSize(1000).each {BasicDBObject dbo-> -////// def query = DbUtils.buildSeaweedQuery(dbo.city, dbo.region, dbo.district_name) -////// if(DbUtils.seaweed.count(query) == 0){ -////// dbo.exist = 0 -////// }else{ -////// dbo.exist = 1 -////// } -////// TEMP.save(dbo) -////// count++ -////// if(count % 1000 == 0){ -////// println(count) -////// } -//////} -//// -//////def list = ["别墅","小区","写字楼","商铺"] -//////int total = 0; -//////int count = 0; -//////FANGJIA_STAT.find(new BasicDBObject(), new BasicDBObject("estate_type", 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(1000).each {BasicDBObject dbo-> -////// if(dbo.estate_type == "商铺" || dbo.estate_type == "写字楼"){ -////// FANGJIA_STAT.remove(new BasicDBObject("_id", dbo._id)) -////// count++ -////// } -////// total ++ -////// if(total % 10000 == 0){ -////// println(total) -////// } -//////} -//////println("删除:${count}") -//////DBCollection TEMP = MongoUtils.getCollectionByName("fangjia_temp", "district_key", "192.168.0.136") -//////DBCollection FANGJIA_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") -//////int total = 0; -//////TEMP.find(new BasicDBObject("exist", 0), new BasicDBObject("city", 1).append("region", 1).append("district_name", 1)).addOption(Bytes.QUERYOPTION_NOTIMEOUT).each {BasicDBObject dbo-> -////// dbo.removeField("_id") -////// def query = dbo -////// WriteResult writeResult = FANGJIA_STAT.remove(query) -////// total += writeResult.getField("n") -////// println(total) -//////} -////Date date = DateUtil.parseDate("20161118 16", "yyyyMMdd HH") -// -////DBCollection TEMP = MongoUtils.getCollectionByName("wenyan", "copy_alias_to_addr_alias", "192.168.0.136") -//// -////Date date = DateUtil.parseDate("20161121 15:30:30") -////CommonUtils.findAllCity().each {def city-> -//// DbUtils.executeQueryOnSeaweed(DbUtils.buildSeaweedQuery(city),{BasicDBObject district-> -//// List alias = district.alias -//// -//// def orgAddrAlias = [] -//// List addrAlias = district.addr_alias -//// if(!addrAlias){ -//// addrAlias = [] -//// }else{ -//// orgAddrAlias.addAll(addrAlias) -//// } -//// -//// boolean isMifity = false -//// if(alias){ -//// for(String a : district.alias){ -//// if(a ==~ /.{2,}(路|道|街).*\d(弄|号)/ && !addrAlias.contains(a) && district.address != a){ -//// addrAlias << a -//// isMifity = true -//// } -//// } -//// if(isMifity){ -//// def update = new BasicDBObject() -//// update.append("addr_alias", addrAlias) -//// update.append("m_date", date) -//// DbUtils.executeUpdateOnSeaweed(new BasicDBObject("_id", district._id), update) -//// println(district.toString() + "------------->" + update) -//// -//// def log = new BasicDBObject() -//// log.append("district_id", district._id.toString()) -//// log.append("m_date", date) -//// log.append("org_addr_alias", orgAddrAlias) -//// log.append("addr_alias", addrAlias) -//// TEMP.save(log) -//// } -//// } -//// -//// },new BasicDBObject("m_date", 1).append("addr_alias", 1).append("alias", 1).append("address", 1)) -////} -// -////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\住宅价格评估.xlsx",{List item-> -//// -//// if(!item['D'] ||!item['E']){ -//// return -//// } -//// String city = "上海" -//// String region = null -//// String name = item['C'] -//// String address = item['D'] -//// Double size = item['E'].toString().toDouble() -//// JSONObject resp = null -//// resp = OpenApiClient.addressMatch(city, address, "district" , false, region , "fuzzy") -//// -//// if(resp && resp.getDouble("credit") > 0){ -//// item['F'] = resp.name -//// if(size && size > 0){ -//// region = resp.district -//// String estate = DbUtils.seaweed.findOne(new BasicDBObject("city", city).append("region", region).append("name", item['F']).append("cat","district").append("visible",0)).estate_type2 -//// def propertyType = "0" -//// if(estate.contains("别墅")){ -//// propertyType = "1" -//// } -//// Map params = new HashMap(); -//// params.put("city", city); -//// params.put("district", region ); -//// params.put("name", item['F']); -//// params.put("scope", "1") -//// params.put("propertyType", String.valueOf(propertyType)) -//// params.put("__refresh_cache","1") -//// params.put("size", size.toString()) -//// JSONObject evaluateResponse = OpenApiClient.evaluateDistrictPrice(params) -//// if((evaluateResponse == null || evaluateResponse.getDouble("credit") == 0)){ -//// if(propertyType == "1"){ -//// params.put("propertyType", "0") -//// }else{ -//// params.put("propertyType", "1") -//// } -//// evaluateResponse = OpenApiClient.evaluateDistrictPrice(params) -//// } -//// if(evaluateResponse && evaluateResponse.getDouble("credit") > 0){ -//// item['G'] = evaluateResponse.avgPrice -//// item['H'] = evaluateResponse.totalPrice -//// }else{ -//// item['G'] = evaluateResponse.avgPrice -//// item['H'] = evaluateResponse.totalPrice -//// } -//// } -//// } -//// println(item) -//// -////}) -////DBCollection OPEN_URI_LOG_COLL = MongoUtils.getCollectionByName("business", "open_uri_log", "192.168.0.60"); -////def apis = ["/property/evaluate","/property/avgPrice","/city/list","/property/search","/property/deal","/property/searchRoom","/property/house","/property/detail","/district/avgPrice","/city/districtAvgPrice","/city/avgPrice2","/city/regions","/block/avgPrice","/property/price","/property/facilities","/property/similarHouseAmout","/property/nearbySimilarHouseAmout","/property/similarHouseRentRange","/property/nearlySimilarHouseRentRange"] -////def data = [] -////def title= ["API"] -////int i = 0 -////for(def api : apis){ -//// def calender = Calendar.getInstance() -//// calender.setTime(DateUtil.parseDate("20151001", "yyyyMMdd")) -//// def item = [] -//// item << api -//// while (calender.getTime().before(new Date())){ -//// def start = calender.getTime() -//// if(i == 0){ -//// title << start.format("yyyy年MM月") -//// } -//// calender.add(Calendar.MONTH, 1) -//// def end = calender.getTime() -//// item << OPEN_URI_LOG_COLL.count(new BasicDBObject("user_id", "1007496").append("request_uri",api).append("c_date", new BasicDBObject('$gte', start).append('$lt', end))) -//// } -//// if(i == 0){ -//// data << title -//// i++ -//// println(title) -//// } -//// data << item -//// println(item) -////} -////ExcelUtils.write("D:\\测试账号统计结果.xls", data, "111") -////def cities = ["佛山","大连","太原","长春","平顶山","镇江","保定","三亚","锦州","安庆","铜川"] -////def data = [] -////data << ["ID","城市","区域","小区名","地址"] -////cities.each {def city-> -//// -//// def dateQuery = new BasicDBObject("c_date", new BasicDBObject('$gt', Date.parse("yyyyMMdd", "20161123")).append('$lt', Date.parse("yyyyMMdd","20161125"))) -//// def query = new BasicDBObject("city",city).append("cat", "district").append("visible", 1) -//// query.putAll(dateQuery) -//// DbUtils.executeQueryOnSeaweed(query,{BasicDBObject district-> -//// data << [district._id.toString(), city, district.region, district.name, district.address] -//// }, new BasicDBObject("region", 1).append("name",1).append("address", 1)) -////} -////ExcelUtils.write("D:\\无效数据.xls", data, "无效数据") -////DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com") -////DBObject q = new BasicDBObject(); -////def cursor = SERVER_AREA_COLL.find(q).sort(new BasicDBObject('city_grade', 1).append('sequence', 1)); -////def allCity = []; -////if (cursor) { -//// for (def dbo : cursor) { -//// def city = dbo.get("display"); -//// if (city != '全国') { -//// String url = "http://${dbo.name}.fangjia.com/trend/trendChart?&defaultCityName=${URLEncoder.encode(city,"UTF-8")}&chartWidth=550&chartHeight=270&__ajax=1&__refresh_cache=1" -//// String url2 = "http://${dbo.name}.fangjia.com/trend/quarterData?&defaultCityName=${URLEncoder.encode(city,"UTF-8")}&chartWidth=550&chartHeight=270&__ajax=1&__refresh_cache=1" -//// String url3 = "http://${dbo.name}.fangjia.com/trend/yearData?&defaultCityName=${URLEncoder.encode(city,"UTF-8")}&chartWidth=550&chartHeight=270&__ajax=1&__refresh_cache=1" -//// String url4 = "http://${dbo.name}.fangjia.com/trend/halfData?&defaultCityName=${URLEncoder.encode(city,"UTF-8")}&chartWidth=550&chartHeight=270&__ajax=1&__refresh_cache=1" -//// try{ -//// new HttpRequest().get(url,[:],"UTF-8") -//// new HttpRequest().get(url2,[:],"UTF-8") -//// new HttpRequest().get(url3,[:],"UTF-8") -//// new HttpRequest().get(url4,[:],"UTF-8") -//// }catch (Exception e){ -//// -//// } -//// -//// } -//// } -////} -////new File("E:\\Users\\wenyan\\Desktop\\mongodb.rsmains0.log.2016-11-28.log").eachLine("UTF-8"){String line-> -//// println(line) -////} -// -////["上海"].each {def city-> -//// def data = [] -//// data << ["城市","区域","名称","名称别名","地址","地址别名","物业类型","建筑类型","是否存在","创建时间"] -//// DbUtils.executeQueryOnSeaweed(DbUtils.buildSeaweedQuery(city),{BasicDBObject dbo-> -//// if(!hasPrice(dbo.city, dbo.region, dbo.name,dbo.estate_type2)){ -//// def names = [dbo.name] -//// if(dbo.alias){ -//// dbo.alias.each {String ali-> -//// if(StringUtils.isNotBlank(ali)){ -//// names << ali -//// } -//// } -//// } -//// def query = new BasicDBObject() -//// query.append("city", city) -//// query.append("district_name", new BasicDBObject('$in', names)) -//// query.append("cat", "addr_district") -//// boolean has = false -//// DbUtils.seabird.find(query).each { -//// if(has){ -//// return -//// } -//// if(it.region == dbo.region){ -//// has = true -//// } -//// } -//// def item = [dbo.city, dbo.region, dbo.name,dbo.alias?.join(","),dbo.address,dbo.addr_alias?.join(","),dbo.estate_type2,dbo.build_type,has? "有":"无", dbo.c_date?.format("yyyy-MM-dd")] -//// data << item -//// println(item) -//// } -//// }) -//// ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\无均价\\${city}.xlsx", data, "无均价小区") -////} -//// -////def boolean hasPrice(def city, def region, def name, def type){ -//// DBCollection district_stat = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") -//// def weekend = DateUtil.getFirstDayOfWeek(new Date()) -//// def query = new BasicDBObject() -//// query.append("city", city) -//// query.append("region", region) -//// query.append("district_name", name) -//// query.append("weekend", weekend) -//// if(type && type.contains("别墅")){ -//// query.append("estate_type","别墅") -//// }else{ -//// query.append("estate_type","小区") -//// } -//// return district_stat.findOne(query) != null -////} -////ExcelUtils.modify("E:\\Users\\wenyan\\Desktop\\IP地址测试结果.xlsx",{List item-> -//// if(item['M']){ -//// def data = GeoUtils.geoconvBaiduToGoogle(item['M'],item['N']) -//// item['M'] = data.lng -//// item['N'] = data.lat -//// item['P'] = GeoUtils.calculateDistance(item['I'], item['j'],item['M'],item['N']) -//// } -//// println(item) -////}) -////def data = [] -////data << ["城市","区域","名称","地址"] -////DbUtils.seaweed.find(new BasicDBObject("city", "上海").append("cat", "office").append("visible", 0).append("region", new BasicDBObject('$in', ["静安","黄浦"]))).each {BasicDBObject district-> -//// data << [district.city, district.region, district.name,district.address] -////} -////ExcelUtils.write("D:\\写字楼.xlsx", data, "数据") -// -////ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\常州江南银行住宅--更新ing(2).xls").each {List item-> -//// def one = (BasicDBObject)DbUtils.seaweed.findOne(DbUtils.buildSeaweedQuery("常州",item['B'], item['c'])) -//// if(one){ -//// if(!one.mark_map){ -//// one.mark_map = new HashMap() -//// } -//// one.mark_map.isNanJingBank = new Integer(1) -//// DbUtils.seaweed.save(one) -//// } -//// -////} -////def shopData = [] -////shopData << ["城市","区域","大类","已安装名称","地址"] -////for(sheetIndex in 5 ..32){ -//// def data = ExcelUtils.read("E:\\Users\\wenyan\\Desktop\\分众一二线城市楼宇点位表(分类入库).xls", sheetIndex) -//// data.each {List item-> -//// def cat = item['D'].toString().replaceAll("\\s", "") -//// if(cat == "商住两用楼" || cat == "高级公寓楼"){ -//// shopData << [item["B"], item["C"], item["D"], item["E"], item["F"]] -//// } -//// } -////} -//////ExcelUtils.write("E:\\Users\\wenyan\\Desktop\\分众一二线城市楼宇点位表(分类入库).xls", shopData, "小区库&楼栋库") -////def file = "E:\\Users\\wenyan\\Desktop\\新建文件夹\\分众一二线城市楼宇点位提取小区.xls" -//////ExcelUtils.multiThreadingModify(file, {List item-> -////// if(item['F'] == null){ -////// JSONObject result = OpenApiClient.addressMatch(item['A'], item['D'], "property", false, null, "fuzzy", false) -////// if(result.getDouble("credit") > 0.5){ -////// item["F"] = result.district -////// item['G'] = result.name -////// item['H'] = "名称" -////// println(item) -////// } -////// } -//////}) -//// -////for(int i =0; i < 3;i ++){ -////// ExcelUtils.modify(file, {List item-> -////// item['D'] = filter(item['A'], item['B'], item['D']) -////// println(item) -////// },i) -//// ExcelUtils.distinct(file ,[0,1,2,3,4,5,6,7],i) -////} -////def filter(String city, String region, String name){ -//// if(name == null){ -//// return null -//// } -//// name = name.replace("(" + city + ")", '').replace("(" + city + ")", '').replace('(商务楼)', '').replaceAll('商务楼$', '') -//// name = name.replace("(写字楼)", "").replace("(商铺)", "").replace("(商场)", "").replace("(公寓楼)","").replace("(办公楼)", "").replace("(商场)", "") -//// name = name.replace("-办公楼", "").replaceAll('(\\(|().+(店|商场|商务广场|号梯|楼)(\\)|))', '').replace('副楼', '').replace('转换区', '') -//// name = name.replaceAll('(\\(|().+路.*(\\)|))', '').replace("裙房", "").replaceAll('(\\(|()[东南西北](\\)|))', '') -//// name = name.replaceAll('(\\(|()[东南西北]楼(\\)|))', '').replace('(裙楼)', '').replaceAll('-?[东南西北](塔|楼)', '') -//// name = name.replaceAll("裙楼\$", '').replaceAll('主楼$', '').replaceAll('\\d+号厅', '') -//// name = name.replaceAll('(' + region + ")", "") -//// name = name.replaceAll("([东南西北前后左右偏侧ABCDEFGHIGK一二三四五六七八九十\\d]|(\\d+号))门\$", '').replace('(索迪)', '').replace('(百货商厦)', '') -//// def stage = DataUtil.match(name , Pattern.compile('(\\(|()[东南西北ABCDEFGHIGK一二三四五六七八九十]+(期|区)(\\)|))')) -//// if(stage){ -//// name = name.replace(stage, stage.replaceAll("\\(|\\)|(|)", '')) -//// println(stage + "-->" + name) -//// } -//// name = name.replaceAll('(\\(|().*(\\)|))', '').replaceAll("第[一二三四五六七八九十]座", '') -//// /*************************************************************************************/ -//// name = name.replaceAll("[\\d+A-Z甲乙丙丁戊戌](栋|幢|楼)", '').replaceAll('[\\d+ABCDEFG一二三四五六七八九十]单元', '').replaceAll("\\d+号楼", '') -//// .replaceAll("[A-Z\\d]座", '').replaceAll('\\d+号$', '').replaceAll("\\d+号梯", '').replaceAll('[左右]厅', '') -//// /*************************************************************************************/ -//// return name -////} -//DBCollection district_stat = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.136") -//district_stat.find(new BasicDBObject(), new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("s_date", 1)).sort(new BasicDBObject('_id', -1)).each {BasicDBObject d-> -// if(d.getString("city").length() > 40 || d.getString("region").length() > 40 || d.getString("name").length() > 40){ -// district_stat.remove(new BasicDBObject("_id", d._id)) -// println(d) -// } -//} -// -// -// -// -// -//def count = 0 -//DBCollection BID_RECORDS_COLL = MongoUtils.getCollectionByName("taobao", "bid_record", "192.168.0.136", 27017) -//BID_RECORDS_COLL.find(new BasicDBObject(), new BasicDBObject("city", 1).append("title", 1)).batchSize(1000).each {BasicDBObject dbo-> -// String region = RegionData.parseRegionFormAddress(dbo.city, dbo.title) -// if(RegionData.isRegion(dbo.city, region)){ -// BID_RECORDS_COLL.update(new BasicDBObject("_id", dbo._id), new BasicDBObject('$set', new BasicDBObject("region", region))) -// } -// if(++count % 1000 == 0){ -// println(count) -// } -//} - -//ExcelUtils.multiThreadingModify("E:\\数据\\日志\\小区自动填充\\覆盖率统计\\小区字段覆盖率统计201703071003.xlsx",{List item-> -// for(int i=1; i < item.size(); i++){ -// item[i] = 100 - item[i] -// } -//}) -//ExcelUtils.multiThreadingModify("D:\\Users\\wenyan\\Desktop\\阳光保险10月估价结果.xlsx",{List item-> -// if(item["S"] && item["S"].toString().toDouble().toInteger() == 1 && !item["M"]){ -// def city = CommonUtils.parseCityInAddress(item["B"]) -// JSONObject resp = OpenApiClient.addressMatch(city, item["B"], "property", false, null, item["D"], null, false) -// if(resp.name){ -// item["M"] = resp.district -// item["N"] = resp.name -// println(item) -// } -// } -//}) \ No newline at end of file +def citys = ["北京", "唐山", "天津", "秦皇岛", "石家庄", "包头", "太原", "丹东", "呼和浩特", "锦州", "沈阳", "吉林", "大连", "牡丹江", "长春", "无锡", "哈尔滨", "扬州", "上海", "徐州", "南京", "温州", "杭州", "金华", "宁波", "蚌埠", "合肥", "安庆", "福州", "泉州", "厦门", "九江", "南昌", "赣州", "济南", "烟台", "青岛", "济宁", "郑州", "洛阳", "武汉", "平顶山", "长沙", "宜昌", "广州", "襄阳", "深圳", "岳阳", "南宁", "常德", "海口", "惠州", "重庆", "湛江", "成都", "韶关", "贵阳", "桂林", "昆明", "北海", "西安", "三亚", "兰州", "泸州", "西宁", "南充", "银川", "遵义", "乌鲁木齐", "大理", "北京", "上海", "广州", "深圳", "重庆", "郑州", "长沙", "西安", "成都", "东莞", "佛山", "杭州", "合肥", "南京", "青岛", "沈阳", "苏州", "天津", "武汉", "珠海", "中山", "长春", "扬州", "烟台", "徐州", "无锡", "温州", "太原", "台州", "石家庄", "绍兴", "厦门", "泉州", "宁波", "南通", "南宁", "南昌", "兰州", "常州", "大连", "福州", "贵阳", "哈尔滨", "海口", "惠州", "济南", "嘉兴", "金华", "昆明", "遵义", "淄博", "株洲", "镇江", "肇庆", "漳州", "湛江", "岳阳", "银川", "宜昌", "盐城", "芜湖", "乌鲁木齐", "唐山", "泰州", "汕头", "三亚", "清远", "秦皇岛", "马鞍山", "洛阳", "柳州", "连云港", "廊坊", "九江", "吉林", "淮安", "湖州", "呼和浩特", "沧州", "保定", "安庆", "张家口", "西宁", "日照", "拉萨", "锦州", "大同", "常德", "北海", "文昌", "陵水", "保亭"] +citys.unique() +citys.each { def city -> + if (RegionData.isCity(city)) { + ElasticUtils.executeSqlQuery("select count(*) as count from seawater where p_date > 20210407 and city='${city}'", { + println("$city\t${it.count}") + }) + } +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy index 3b51386dc..e2790a624 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy @@ -11,8 +11,8 @@ import org.bson.Document import static com.mongodb.client.model.Filters.* MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") -def startDate = DateUtil.parseDate("20210301", "yyyyMMdd") -def endDate = DateUtil.parseDate("20210401", "yyyyMMdd") +def startDate = DateUtil.parseDate("20210401", "yyyyMMdd") +def endDate = DateUtil.parseDate("20210501", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy index c03f780d8..08bf4c5b7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy @@ -11,26 +11,44 @@ import org.bson.Document import static com.mongodb.client.model.Filters.* MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") -def startDate = DateUtil.parseDate("20210301", "yyyyMMdd") -def endDate = DateUtil.parseDate("20210401", "yyyyMMdd") +def startDate = DateUtil.parseDate("20210401", "yyyyMMdd") +def endDate = DateUtil.parseDate("20210501", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 def hashSet = [] -def data = [["用户ID", "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg", "参数", "resMap"]] +def data = [] +def title = ["用户ID", "用户名称", "IP", "访问链接", "访问时间", "dataStatus", "code", "msg"] +def param_keys = ["tid", "city", "district", "address", "name", "size", "propertyType"] +param_keys.each { + title << "参数_${it}" +} +def resMap_keys = ["city", "district", "name", "avgPrice", "totalPrice", "buildYear"] +resMap_keys.each { + title << "结果_${it}" +} +data << title +def keys = new HashSet() while (startDate.before(endDate)) { calendar.add(Calendar.DATE, 1) def nextDate = calendar.getTime() count++ OPEN_URI_LOG.find(and(eq("user_id", "1007721"), eq("request_uri", "/property/evaluate3"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc -> def result = JSONObject.fromObject(doc.res_map.result) - if(!result.buildYear || !result.avgPrice){ + if (!result.buildYear || !result.avgPrice) { return } def params = JSONObject.fromObject(doc.parameter_map) + keys.addAll(params.keys()) def key = "${params.address}_${params.size}".toString() if (!hashSet.contains(key)) { - def item = ["1007721", "scjc", doc.ip, doc.request_uri, doc.c_date, doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] + def item = ["1007721", "scjc", doc.ip, doc.request_uri, doc.c_date.format("yyy"), doc.data_status, doc.code, doc.msg] + param_keys.each { + item << params[it] + } + resMap_keys.each { + item << result[it] + } data << item hashSet << key } else { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index 4926d96d1..8bc805491 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -167,7 +167,7 @@ public class AddressParserServiceImpl implements AddressParserService { Building matchedBuilding; //keywords使用aliyun接口返回的poi AliyunBo aliyunBo = null; - if(params.isUseAliyunApi()){ + if(params.isUseAliyunApi() && AddressParserGoal.Match.equals(addr.getAddressParserGoal())){ aliyunBo = aliyunService.addressStand(params.getAddress(), params.getCity()); if(aliyunBo != null){ String poi = ((aliyunBo.getPoi() == null ? "":aliyunBo.getPoi()) + (aliyunBo.getSubpoi() == null ? "":aliyunBo.getSubpoi())).replaceAll("\\s*", ""); @@ -192,6 +192,16 @@ public class AddressParserServiceImpl implements AddressParserService { } } } + AddressMatchMetaData meta = null; + if(StringUtils.isBlank(addr.getCity())){ + addr.addKeyword(addr.getOrgAddress()); + meta = getMapMeta(addr); + if(meta != null){ + addr.setProvince(meta.getMapProvince()); + addr.setCity(meta.getMapCity()); + addr.setDistrict(meta.getDistrict()); + } + } if(params.isUseMap()){ matchedBuilding = findMatchedBuilding(addr, params.getBuildingType(), MetaDataType.MAP); }else{ @@ -201,51 +211,50 @@ public class AddressParserServiceImpl implements AddressParserService { matchedBuilding.setSearchAddress(addr); matchedBuilding.setSuggestName(getSuggestName(matchedBuilding)); matchedBuilding.setSuggestAddress(getSuggestAddress(matchedBuilding)); - if(params.isUseAliyunApi() && aliyunBo != null){ + if(params.isUseAliyunApi() && aliyunBo != null && AddressParserGoal.Match.equals(addr.getAddressParserGoal())){ completBuildingField(matchedBuilding, aliyunBo, params); } Address tempAddr = matchedBuilding.getSearchAddress(); - if(StringUtils.isBlank(tempAddr.getProvince()) || StringUtils.isBlank(tempAddr.getCity()) || StringUtils.isBlank(tempAddr.getDistrict())|| StringUtils.isBlank(tempAddr.getStreet())){ -// List metaDatas = addressRepoService.findAllByKeyword(null, params.getBuildingType(), new ArrayList() {{add(tempAddr.getOrgAddress());}}, tempAddr.getLng(), tempAddr.getLat(), 100, false); - tempAddr.addKeyword(tempAddr.getOrgAddress()); - List metaDatas = findMatchMetaData(tempAddr, params.getBuildingType(), MetaDataType.MAP, false); -// String addressStr = (StringUtils.isBlank(tempAddr.getStreet())?"":tempAddr.getStreet()) + (StringUtils.isBlank(tempAddr.getStreetNumber())?"":tempAddr.getStreetNumber()); - Map> metaDataMap = new HashMap>(); - if(StringUtils.isBlank(tempAddr.getDistrict()) && !metaDatas.isEmpty()){ - for(AddressMatchMetaData metaData:metaDatas){ - if(StringUtils.isNotBlank(metaData.getMapCity())){ - List metaList = metaDataMap.containsKey(metaData.getMapCity()) ? metaDataMap.get(metaData.getMapCity()) : new ArrayList(); - metaList.add(metaData); - metaDataMap.put(metaData.getMapCity(),metaList); - } - } - String tempCity = ""; - if(StringUtils.isNotBlank(tempAddr.getCity()) && metaDataMap.containsKey(tempAddr.getCity())){ - tempCity = tempAddr.getCity(); - }else{ - int size = 0; - for(String key:metaDataMap.keySet()){ - if(metaDataMap.get(key).size() > size){ - size = metaDataMap.get(key).size(); - tempCity = key; - } - } - } - if(StringUtils.isNotBlank(tempCity)){ - AddressMatchMetaData meta = metaDataMap.get(tempCity).get(0); - tempAddr.setProvince(meta.getMapProvince()); - tempAddr.setCity(meta.getMapCity()); - tempAddr.setDistrict(meta.getDistrict()); - if((tempAddr.getKeywords()!=null && tempAddr.getKeywords().equals(meta.getMainName()))){ - matchedBuilding.setAddress(meta.getAddress()); - } - } + if(StringUtils.isBlank(tempAddr.getStreet()) && AddressParserGoal.Match.equals(addr.getAddressParserGoal())){ + if(meta != null && (tempAddr.getKeywords()!=null && tempAddr.getKeywords().equals(meta.getMainName()))){ + matchedBuilding.setAddress(meta.getAddress()); } } matchedBuilding.setSearchAddress(tempAddr); return matchedBuilding; } + private AddressMatchMetaData getMapMeta(Address tempAddr){ + tempAddr.addKeyword(tempAddr.getOrgAddress()); + List metaDatas = findMatchMetaData(tempAddr, null, MetaDataType.MAP, false); + Map> metaDataMap = new HashMap>(); + if(StringUtils.isBlank(tempAddr.getDistrict()) && !metaDatas.isEmpty()){ + for(AddressMatchMetaData metaData:metaDatas){ + if(StringUtils.isNotBlank(metaData.getMapCity())){ + List metaList = metaDataMap.containsKey(metaData.getMapCity()) ? metaDataMap.get(metaData.getMapCity()) : new ArrayList(); + metaList.add(metaData); + metaDataMap.put(metaData.getMapCity(),metaList); + } + } + String tempCity = ""; + if(StringUtils.isNotBlank(tempAddr.getCity()) && metaDataMap.containsKey(tempAddr.getCity())){ + tempCity = tempAddr.getCity(); + }else{ + int size = 0; + for(String key:metaDataMap.keySet()){ + if(metaDataMap.get(key).size() > size){ + size = metaDataMap.get(key).size(); + tempCity = key; + } + } + } + if(StringUtils.isNotBlank(tempCity)){ + AddressMatchMetaData meta = metaDataMap.get(tempCity).get(0); + return meta; + } + } + return null; + } /** * 信息不全时使用阿里接口补全数据 * @param matchedBuilding @@ -385,6 +394,7 @@ public class AddressParserServiceImpl implements AddressParserService { addr.setSuggestDistrict(params.getSuggestDistrict()); addr.setSuggestName(params.getSuggestName()); addr.setPreciseLevel(params.getPreciseLevel()); + addr.setAddressParserGoal(params.getAddressParserGoal()); addr.setProvince(params.getProvince()); addr.setDebugName(params.getDebugName()); return AddressProcessors.process(addr); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java index 2e286a5ed..58022cf03 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/mode/Address.java @@ -78,6 +78,16 @@ public class Address { private AliyunBo aliyunBo; + public AddressParserGoal getAddressParserGoal() { + return addressParserGoal; + } + + public void setAddressParserGoal(AddressParserGoal addressParserGoal) { + this.addressParserGoal = addressParserGoal; + } + + /**地址解析目的*/ + private AddressParserGoal addressParserGoal; public AliyunBo getAliyunBo() { return aliyunBo; } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java index 98fac4be7..6f88c20ef 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/CityProcessor.java @@ -52,8 +52,8 @@ public class CityProcessor extends AbstractAddressProcessor { } if(StringUtils.isNotBlank(city) && CityStatus.SURE != address.getCityStatus() ){ String formatCity = RegionData.formatCity(city); - String possibleCity = parseCityFromAddress(orgAddress, address); - String confirmCity = null; + String possibleCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) ? parseCityFromAddress(orgAddress, address) : null; + String confirmCity = AddressParserGoal.Match.equals(address.getAddressParserGoal()) ? null : formatCity; /**如果省份和城市信息相互矛盾 则用区域推断城市*/ if(StringUtils.isNotBlank(address.getProvince()) && !ProvinceData.belongTo(formatCity, address.getProvince())){ List possibleCities = speculateCityNameByRegion(address, city); @@ -62,7 +62,7 @@ public class CityProcessor extends AbstractAddressProcessor { confirmCity = formatCity; } } - if(formatCity == null || !formatCity.equals(possibleCity)){ + if(AddressParserGoal.Match.equals(address.getAddressParserGoal()) && (formatCity == null || (possibleCity!=null && !formatCity.equals(possibleCity)))){ confirmCity = possibleCity; } if(null != confirmCity){ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/ProvinceProcessor.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/ProvinceProcessor.java index 0f9759d2e..1b0aa3a56 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/ProvinceProcessor.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/processor/ProvinceProcessor.java @@ -2,6 +2,7 @@ package com.fangjia.service.address.processor; import com.fangjia.core.RegionData; import com.fangjia.service.address.mode.Address; +import com.fangjia.service.address.mode.AddressParserGoal; import com.fangjia.service.address.mode.CityStatus; import com.fangjia.service.address.mode.ProvinceData; import org.apache.commons.lang.StringUtils; @@ -24,9 +25,9 @@ public class ProvinceProcessor extends AbstractAddressProcessor { String orgAddress = address.getAddress(); String[] provinceInfo = getProvince(orgAddress); - /*if(provinceInfo == null && address.getCity() != null){ + if(provinceInfo == null && address.getCity() != null && !AddressParserGoal.Match.equals(address.getAddressParserGoal())){ provinceInfo = getProvince(address.getCity()); - }*/ + } if (null != provinceInfo) { String province = provinceInfo[NAME_IDX]; if (provinceInfo[FULL_NAME_IDX] != null) {//全称匹配 diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index 19e45d136..bea9e7589 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2495,10 +2495,12 @@ public class DistrictServiceImpl implements DistrictService { params.add(new QueryParam("visible", 0)); params.add(new QueryParam("city", city)); params.add(new QueryParam("category", "district")); - params.add(new QueryParam("keyword", keyword)); - Query query = boostQueryDistrictPolicy.create(ServiceUtil.removeAndGetKeyword(params)); - if (query != null) { - params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(query))); + if (StringUtils.isNotBlank(keyword)) { + BooleanQuery query = new BooleanQuery(); + Query q1 = new TermQuery(new Term("keyword", keyword)); + q1.setBoost(0.99f); + query.add(q1, Occur.SHOULD); + params.add(new QueryParam("$sr", new SrQuery(query))); } return districtDao.findAllByParams(params, limit); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressService.java index 3bfa96333..00a98a047 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressService.java @@ -284,5 +284,12 @@ public interface AddressService { * @return */ AddressCheckTruth aroundConsumeGrade(String city, String address); - + + /** + * 量地址相似度评级 + * @param result1 + * @param result2 + * @return 返回是否同一地址、输出级别(哪一级),相似度得分 + */ + Map addressSimilarity(String result1, String result2); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java index ff7454cc5..221fecc5b 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/web/AddressServiceImpl.java @@ -25,6 +25,9 @@ import java.util.concurrent.Future; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fangjia.core.util.*; +import com.fangjia.service.address.AddressParserUtil; +import com.fangjia.service.address.mode.MatchResult; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -49,18 +52,8 @@ import org.sothis.core.util.Closure; import com.fangjia.core.BlockData; import com.fangjia.core.RegionData; -import com.fangjia.core.util.AddressParser; -import com.fangjia.core.util.AddressParserUtils; -import com.fangjia.core.util.AddressResult; -import com.fangjia.core.util.BeanUtils; -import com.fangjia.core.util.CacheUtils; import com.fangjia.core.util.CacheUtils.CachePolicyEnum; -import com.fangjia.core.util.DataUtil; -import com.fangjia.core.util.DateUtil; -import com.fangjia.core.util.GeoUtils; import com.fangjia.core.util.GeoUtils.GaussSphere; -import com.fangjia.core.util.HttpRequest; -import com.fangjia.core.util.LoggerFactory; import com.fangjia.dal.QueryParam; import com.fangjia.dal.SdQuery; import com.fangjia.dal.SrQuery; @@ -5074,7 +5067,162 @@ public class AddressServiceImpl implements AddressService { } return checkTr; } - + + @Override + public Map addressSimilarity(String result1, String result2) { + JSONObject json1 = (JSONObject) JSONObject.fromObject(result1).get("result"); + JSONObject json2 = (JSONObject) JSONObject.fromObject(result2).get("result"); + Map resultMap = new HashMap(); + //判断是否同一地址 + boolean sameAddress = validSameAddress(json1, json2); + String formatAddress1_pinyin = AddressParserUtil.toHanYuPinYin(getFromJson(json1, "formattedAddress")); + String formatAddress2_pinyin = AddressParserUtil.toHanYuPinYin(getFromJson(json2,"formattedAddress")); + double similar = AddressParserUtil.getSimilarityRatio(formatAddress1_pinyin, formatAddress2_pinyin); + String level = getAddressSimilarityLevel(json1, json2); + resultMap.put("isSameAddress", sameAddress); + resultMap.put("score", similar); + resultMap.put("level", level); + resultMap.put("formattedAddress_1", getFromJson(json1,"formattedAddress")); + resultMap.put("formattedAddress_2", getFromJson(json2,"formattedAddress")); + return resultMap; + } + + private boolean validSameAddress(JSONObject json1, JSONObject json2){ + //标准化后地址完全一样 + if(getFromJson(json1, "formattedAddress").equals(getFromJson(json2, "formattedAddress"))){ + return true; + } + //判断判断省、市、区、乡镇、楼栋、单元、室号是否相同 + if(!verifySameField(getFromJson(json1,"province"), getFromJson(json2,"province"), false) + || !verifySameField(getFromJson(json1,"city"), getFromJson(json2,"city"), false) + || !verifySameField(getFromJson(json1,"district"), getFromJson(json2,"district"), false) + || !verifySameField(getFromJson(json1,"township"), getFromJson(json2,"township"), false) + || !verifySameField(getFromJson(json1,"buildingNumber"), getFromJson(json2,"buildingNumber"), true) + || !verifySameField(getFromJson(json1,"unitNumber"), getFromJson(json2,"unitNumber"), true) + || !verifySameField(getFromJson(json1,"roomNumber"), getFromJson(json2,"roomNumber"), true)){ + return false; + } + + String street1 = (StringUtils.isNotBlank(getFromJson(json1,"street")) ? getFromJson(json1,"street") : "") + (StringUtils.isNotBlank(getFromJson(json1,"streetNumber")) ? getFromJson(json1,"streetNumber") : ""); + String street2 = (StringUtils.isNotBlank(getFromJson(json2,"street")) ? getFromJson(json2,"street") : "") + (StringUtils.isNotBlank(getFromJson(json2,"streetNumber")) ? getFromJson(json2,"streetNumber") : ""); + String name1 = StringUtils.isNotBlank(getFromJson(json1,"name")) ? getFromJson(json1,"name") : ""; + String name2 = StringUtils.isNotBlank(getFromJson(json2,"name")) ? getFromJson(json2,"name") : ""; + //两个地址中路名+路号和poi全部为空时返回true + if(StringUtils.isBlank(street1) && StringUtils.isBlank(street2) && StringUtils.isBlank(name1) && StringUtils.isBlank(name2)){ + return true; + } + //同一条地址里路名和poi不能全为空而另一条至少有一项有值 + if((StringUtils.isBlank(street1) && StringUtils.isBlank(name1)) || (StringUtils.isBlank(street2) && StringUtils.isBlank(name2))){ + return false; + } + //poi有任意一个为空则路名、路号必须完全一致 + if(StringUtils.isBlank(name1) || StringUtils.isBlank(name2)){ + if(StringUtils.isNotBlank(getFromJson(json1,"street")) && getFromJson(json1,"street").equals(getFromJson(json2,"street")) + && StringUtils.isNotBlank(getFromJson(json1,"streetNumber")) && getFromJson(json1,"streetNumber").equals(getFromJson(json2,"streetNumber"))){ + return true; + }else{ + return false; + } + } + //poi全不为空时,路名+路号一致(可为空),poi处理后一致 + if(verifySameField(street1, street2, false) && verifySamePoi(name1, name2)){ + return true; + } + return false; + } + + private String getFromJson(JSONObject json, String key){ + if(json.containsKey(key)){ + return json.getString(key); + } + return null; + } + /** + * 获取两地址的相似度评级(最小颗粒度) + * @return + */ + private String getAddressSimilarityLevel(JSONObject json1, JSONObject json2){ + if(StringUtils.isNotBlank(getFromJson(json1,"roomNumber")) || StringUtils.isNotBlank(getFromJson(json2,"roomNumber"))){ + return "roomNumber"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"unitNumber")) || StringUtils.isNotBlank(getFromJson(json2,"unitNumber"))){ + return "unitNumber"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"buildingNumber")) || StringUtils.isNotBlank(getFromJson(json2,"buildingNumber"))){ + return "buildingNumber"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"name")) || StringUtils.isNotBlank(getFromJson(json2,"name"))){ + return "name"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"street")) || StringUtils.isNotBlank(getFromJson(json2,"street"))){ + return "street"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"township")) || StringUtils.isNotBlank(getFromJson(json2,"township"))){ + return "township"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"district")) || StringUtils.isNotBlank(getFromJson(json2,"district"))){ + return "district"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"city")) || StringUtils.isNotBlank(getFromJson(json2,"city"))){ + return "city"; + }else if(StringUtils.isNotBlank(getFromJson(json1,"province")) || StringUtils.isNotBlank(getFromJson(json2,"province"))){ + return "province"; + } + return null; + } + /** + * 判断省、市、区、乡镇、楼栋、单元、室号是否相同(两者全为空时返回true) + * @param str1 + * @param str2 + * @param flag true时严格判断 两者完全一致返回true(全为空或者全部有值并且值一致) + * false时 两者完全一致或一方为空返回true(全为空或者全部有值并且值一致或任一方值为空) + * @return + */ + private boolean verifySameField(String str1, String str2,boolean flag){ + if(flag){ + if(StringUtils.isBlank(str1) && StringUtils.isBlank(str2)){ + return true; + } + return StringUtils.isNotBlank(str1) ? str1.equals(str2) : false; + }else{ + if(StringUtils.isBlank(str1) || StringUtils.isBlank(str2)){ + return true; + } + return str1.equals(str2); + } + } + + /** + * //判断是否同一个poi(全部有数据时) + * @param name1 + * @param name2 + * @return + */ + private boolean verifySamePoi(String name1, String name2){ + if(StringUtils.isBlank(name1) && StringUtils.isBlank(name2)){ + return false; + } + if(name1.equals(name2)){ + return true; + } + //分期 + String name1_stage = AddressParserUtil.match(AddressParserPatterns.STAGE_PATTERN,name1); + String name2_stage = AddressParserUtil.match(AddressParserPatterns.STAGE_PATTERN,name2); + //分区 + String name1_partition = AddressParserUtil.match(AddressParserPatterns.PARTITION_PATTERN,name1); + String name2_partition = AddressParserUtil.match(AddressParserPatterns.PARTITION_PATTERN,name2); + //数字 + String name1_number = AddressParserUtil.match(Pattern.compile("[\\d一二三四五六七八九十千百万]+"),name1); + String name2_number = AddressParserUtil.match(Pattern.compile("[\\d一二三四五六七八九十千百万]+"),name2); + if(!verifySameField(name1_stage, name2_stage, true) || !verifySameField(name1_partition, name2_partition, true)|| !verifySameField(name1_number, name2_number, true)){ + return false; + } + String name_1_pinyin = AddressParserUtil.toHanYuPinYin(name1); + String name_2_pinyin = AddressParserUtil.toHanYuPinYin(name2); + //拼音或文本数据包含并且 + boolean pinYinContains = (name_1_pinyin.contains(name_2_pinyin) || name_2_pinyin.contains(name_1_pinyin)); + if(pinYinContains){ + double similar = AddressParserUtil.getSimilarityRatio(name_1_pinyin, name_2_pinyin); + if(similar > 0.5){ + return true; + } + } + return false; + } + /** * 设置区域消费指数 * @param checkTr diff --git a/projects/fangjia-static/pom.xml b/projects/fangjia-static/pom.xml index 6a048340d..7be7f7dae 100644 --- a/projects/fangjia-static/pom.xml +++ b/projects/fangjia-static/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 com.fangjia diff --git a/projects/geluke/Dockerfile b/projects/geluke/Dockerfile new file mode 100644 index 000000000..d0b8e61a1 --- /dev/null +++ b/projects/geluke/Dockerfile @@ -0,0 +1,2 @@ +FROM 192.168.0.19:9012/tomcat6:latest +COPY target/*.war /home/goojia/webapps/ROOT.war \ No newline at end of file diff --git a/projects/geluke/pom.xml b/projects/geluke/pom.xml index c168bf1c6..62875968c 100644 --- a/projects/geluke/pom.xml +++ b/projects/geluke/pom.xml @@ -51,7 +51,7 @@ org.sothis sothis-web - 0.2.0-SNAPSHOT + 0.2.0 org.springframework diff --git a/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java b/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java index 7f0f840b6..cbc446e97 100644 --- a/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java +++ b/projects/geluke/src/main/java/com/fangjia/geluke/controllers/DistrictController.java @@ -22,14 +22,8 @@ public class DistrictController { private DistrictService districtService; public Object loadDistrictAction(DistrictModel model, HttpServletRequest request){ - String url = openSearchService.createQueryUrl(model.getCityName(), model.getKeywords(), false); - String content = openSearchService.findResultByUrl(url); - List regions = districtService.getRegionByCity(model.getCityName()); - Map> map = openSearchService.parseResult(content, regions, model.getKeywords()); - if(map.size() == 0){ - List districts = districtService.findNewDistrict(model.getCityName(), model.getKeywords()); - map = openSearchService.createResult(districts); - } + List districts = districtService.findDistrictByKeyword(model.getCityName(), model.getKeywords(), 10); + Map> map = openSearchService.createResult(districts); JsonModel ret = new JsonModel(); ret.setJsonModel(map); return ret; diff --git a/projects/geluke/src/main/java/com/fangjia/geluke/model/BaseModel.java b/projects/geluke/src/main/java/com/fangjia/geluke/model/BaseModel.java index 5a4d1e6d6..3f52fa63b 100644 --- a/projects/geluke/src/main/java/com/fangjia/geluke/model/BaseModel.java +++ b/projects/geluke/src/main/java/com/fangjia/geluke/model/BaseModel.java @@ -155,11 +155,11 @@ public class BaseModel extends ModelAndViewSupport { } public final String getRoot() { - return (CONFIG.isDevelopmentEnvironment() ? "/geluke" : ""); + return "http://geluke.fangjia.com"; } public final String getWwwUrl() { - return WWW_URL; + return "http://geluke.fangjia.com"; } public final Date getNow() { @@ -270,7 +270,7 @@ public class BaseModel extends ModelAndViewSupport { } public final String getCityUrl() { - return CONFIG.getCityDomainName() + getRoot(); + return "http://geluke.fangjia.com"; } public final String getDomain() { diff --git a/projects/geluke/src/main/resources/geluke.properties b/projects/geluke/src/main/resources/geluke.properties index 5b0aeb064..f19395452 100644 --- a/projects/geluke/src/main/resources/geluke.properties +++ b/projects/geluke/src/main/resources/geluke.properties @@ -17,16 +17,32 @@ fangjia.auto.url=${fangjia.auto.host}:${fangjia.auto.port}/ fangjia.file.mongo.host=fs.mongo.db.fangjia.com fangjia.file.mongo.port=27017 +#fangjia.log.mongo.host=log.mongo.db.fangjia.com +#fangjia.log.mongo.port=27017 + fangjia.log.mongo.host=log.mongo.db.fangjia.com -fangjia.log.mongo.port=27017 +fangjia.log.mongo.port=52002 +fangjia.log.mongodb.mongoUri=mongodb://${fangjia.log.mongo.host}:${fangjia.log.mongo.port}/ fangjia.mongo.host=mongo.db.fangjia.com -fangjia.mongo.port=27017 +fangjia.mongo.port=28017 +fangjia.secondary.mongo.host=secondary.mongo.db.fangjia.com +fangjia.secondary.mongo.port=28017 +fangjia.mongodb.mongoUri=mongodb://${fangjia.mongo.host}:${fangjia.mongo.port},${fangjia.secondary.mongo.host}:${fangjia.secondary.mongo.port}/ + + +fangjia.fs.mongo.host=fs.mongo.db.fangjia.com +fangjia.fs.mongo.port=27017 +fangjia.fs.mongodb.mongoUri=mongodb://${fangjia.fs.mongo.host}:${fangjia.fs.mongo.port}/ + +fangjia.seabird.mongodb.mongoUri=mongodb://developer:G00IDCDEV12385@${fangjia.mongo.host}:${fangjia.mongo.port},${fangjia.secondary.mongo.host}:${fangjia.secondary.mongo.port}/ + fangjia.knowbase.host=knowbase.db.fangjia.com fangjia.knowbase.port=7180 fangjia.knowbase.url=${fangjia.knowbase.host}:${fangjia.knowbase.port}/ + fangjia.environment=development #fangjia.environment=production diff --git a/projects/geluke/src/main/resources/spring-context.xml b/projects/geluke/src/main/resources/spring-context.xml index 6c59dd2d3..20d2cf31f 100644 --- a/projects/geluke/src/main/resources/spring-context.xml +++ b/projects/geluke/src/main/resources/spring-context.xml @@ -18,8 +18,15 @@ - - + + + + + + + + + @@ -29,20 +36,27 @@ - - - - + + + + + + - - - + + + - - - - + + + + + + + + + - - AccessLogFilter - - com.fangjia.geluke.filters.AccessLogFilter - - + + + + + + SpiderValidateFilter @@ -47,20 +47,20 @@ - - AnalyticsFilter - - org.springframework.web.filter.DelegatingFilterProxy - - - targetBeanName - analyticsFilter - - - targetFilterLifecycle - true - - + + + + + + + + + + + + + + sothis @@ -80,21 +80,21 @@ /* REQUEST - - AccessLogFilter - /* - REQUEST - + + + + + SpiderValidateFilter /* REQUEST - - AnalyticsFilter - /* - REQUEST - + + + + + sothis /* diff --git a/projects/geluke/src/main/webapp/header/change_city.ftl b/projects/geluke/src/main/webapp/header/change_city.ftl index 565630c82..c0b59e53c 100644 --- a/projects/geluke/src/main/webapp/header/change_city.ftl +++ b/projects/geluke/src/main/webapp/header/change_city.ftl @@ -23,58 +23,55 @@ id="changecity">
  • 鍗庝笢鍩庡競
  • 鍗庡寳涓滃寳
  • 鍗庡崡鍗庝腑
  • 瑗块儴鍩庡競
  • - -
  • <#--鍦板浘鍩庡競鍒囨崲 end--> \ No newline at end of file diff --git a/projects/geluke/src/main/webapp/header/header_map.ftl b/projects/geluke/src/main/webapp/header/header_map.ftl index e6dc0d09f..19925acd2 100644 --- a/projects/geluke/src/main/webapp/header/header_map.ftl +++ b/projects/geluke/src/main/webapp/header/header_map.ftl @@ -28,7 +28,7 @@ $(document).ready(function(){ $("#_h_logout").click(function(){ jQuery.ajax({ type: "get", - url: "http://" + location.host + "${root}/user/logout", + url: "http://geluke.fangjia.com/user/logout", dataType:'json', success: function(msg){ location.href = '${cityUrl}'; diff --git a/projects/geluke/src/main/webapp/map/cityNavi.ftl b/projects/geluke/src/main/webapp/map/cityNavi.ftl index f4d08c9b5..7e8a3197c 100644 --- a/projects/geluke/src/main/webapp/map/cityNavi.ftl +++ b/projects/geluke/src/main/webapp/map/cityNavi.ftl @@ -200,27 +200,9 @@ diff --git a/projects/geluke/src/main/webapp/map/index.ftl b/projects/geluke/src/main/webapp/map/index.ftl index 43e39e199..5dc9aa1eb 100644 --- a/projects/geluke/src/main/webapp/map/index.ftl +++ b/projects/geluke/src/main/webapp/map/index.ftl @@ -1,766 +1,767 @@ -<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> -<#compress> - - - - -geluke - - - - - - - - - -
    - -

    鏁憡鐢ㄦ埛锛�

    - 鎮ㄥ綋鍓嶇殑娴忚鍣ㄥ彲鑳芥棤娉曡緝濂界殑鏀寔鏈郴缁燂紝璇蜂娇鐢‵ireFox锛堢伀鐙愶級 鎴� Chrome锛堣胺姝岋級娴忚鍣ㄤ互杈惧埌瀹岀編浣撻獙锛� -
    - -<#include "/header/top.ftl" /> -
    -
    - -
    - -
    - -
    -
    - ${cityName!} - [閫夋嫨鍩庡競] -
    - -
    - - <#--
    - ${name!} 閫�鍑� -
    --> -
    -
    - - <#include "../header/header_map.ftl" /> - - - - - -
    -
    -
    - - -
    -
    - -
    -
    - - - -
    - - - <#--
    - <#if (otherShops??&&otherShops?size>0)> - <#list otherShops as shopName> -

    - - -
    --> - -
    -
    - 娓╅Θ鎻愮ず锛� -
    鐢变簬鏁版嵁杈冨锛屾暟鎹皢鍦ㄥ湴鍥炬斁澶у埌涓�瀹氱殑绾у埆鍚庢樉绀�
    -
    - -
    -
    - - -
    -
    -
    0绫�
    -
    - - - - -
    - -
    -
    -
      -
    - -
      -
    • - - - - -
    • - -
    - -
      -
    • - - - - -
    • -
    -
    -
    -
    -
    -
    -
    - - -
    - <#----> -
    - - 姝e湪鍔姏鍔犺浇鏁版嵁锛岃绋嶅��...... -
    -
    - 鍔犺浇鏁版嵁澶锛岃鏀惧ぇ鍦板浘...... -
    - <#-- -
    -
    - --> -
    - <#--
    --> - <#--
    --> - <#if (supportAuto==1)> -
    鑷姩鍟嗗湀
    - - -
    - 浜哄彛灞曠ず -
    -
      -
    • -
    • -
    • -
    • -
    -
    -
    -
    - 鑱氬鐐瑰睍绀� -
    -
      -
    • -
    • -
    • -
    • -
    • -
    • -
    • - <#if (supportHot==1)> -
    • - -
    -
    -
    - -
    淇濆瓨鍟嗗湀
    - -
    - 灞呮皯鎴锋暟锛�-鎴� - 灏忓尯鍧囦环锛�-鍏� - 鍔炲叕浜烘暟锛�-浜� - -
    - - -
    -
    -
    -
      -
    • 鏂版潙
    • -
    • 鏅�氬晢鍝佹埧
    • -
    • 楂樼骇鍟嗗搧鎴�
    • -
    • 鍐欏瓧妤�
    • -
    -
    -
    -
      -
    •  
    • -
    • 鍦ㄥ缓鏅�氬晢鍝佹埧
    • -
    • 鍦ㄥ缓楂樼骇鍟嗗搧鎴�
    • -
    • 鍦ㄥ缓鍐欏瓧妤�
    • -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    鐑害浣�
    -
    鐑害楂�
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    鏃�
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    鏃�
    -
    -
    - - - -
    -
    -
    -
    -
    - - -
    - - 璇峰厛纭畾闂ㄥ簵浣嶇疆 -
    - -
    -
    X
    -
    璇风偣鍑� 纭鍦板潃 鎴� 鎷栨嫿 鍒版偍闇�瑕佺殑鍦板潃鐒跺悗纭畾
    -
    - - -
    - 寮�鍚儹鍔涘浘 -
    -
      -
    • -
    • -
    • - <#--
    • --> - <#--
    • --> -
    -
    -
    - -
    - 寮�鍚綉鏍煎浘 - -
    -
      -
    • -
    • -
    • -
    -
    -
    - - - -
    -
    - -
    -
    -
    - - -
    -
    -
    - - - - - - - - - - - -

    -
    - - - - - - - - - - - - - - - - - - - - - +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + +geluke + + + + + + + + + +
    + +

    鏁憡鐢ㄦ埛锛�

    + 鎮ㄥ綋鍓嶇殑娴忚鍣ㄥ彲鑳芥棤娉曡緝濂界殑鏀寔鏈郴缁燂紝璇蜂娇鐢‵ireFox锛堢伀鐙愶級 鎴� Chrome锛堣胺姝岋級娴忚鍣ㄤ互杈惧埌瀹岀編浣撻獙锛� +
    + +<#include "/header/top.ftl" /> +
    +
    + +
    + +
    + +
    +
    + ${cityName!} + [閫夋嫨鍩庡競] +
    + +
    + + <#--
    + ${name!} 閫�鍑� +
    --> +
    +
    + + <#include "../header/header_map.ftl" /> + + + + + +
    +
    +
    + + +
    +
    + +
    +
    + + + +
    + + + <#--
    + <#if (otherShops??&&otherShops?size>0)> + <#list otherShops as shopName> +

    + + +
    --> + +
    +
    + 娓╅Θ鎻愮ず锛� +
    鐢变簬鏁版嵁杈冨锛屾暟鎹皢鍦ㄥ湴鍥炬斁澶у埌涓�瀹氱殑绾у埆鍚庢樉绀�
    +
    + +
    +
    + + +
    +
    +
    0绫�
    +
    + + + + +
    + +
    +
    +
      +
    + +
      +
    • + + + + +
    • + +
    + +
      +
    • + + + + +
    • +
    +
    +
    +
    +
    +
    +
    + + +
    + <#----> +
    + + 姝e湪鍔姏鍔犺浇鏁版嵁锛岃绋嶅��...... +
    +
    + 鍔犺浇鏁版嵁澶锛岃鏀惧ぇ鍦板浘...... +
    + <#-- +
    +
    + --> +
    + <#--
    --> + <#--
    --> + <#if (supportAuto==1)> +
    鑷姩鍟嗗湀
    + + +
    + 浜哄彛灞曠ず +
    +
      +
    • +
    • +
    • +
    • +
    +
    +
    +
    + 鑱氬鐐瑰睍绀� +
    +
      +
    • +
    • +
    • +
    • +
    • +
    • +
    • + <#if (supportHot==1)> +
    • + +
    +
    +
    + +
    淇濆瓨鍟嗗湀
    + +
    + 灞呮皯鎴锋暟锛�-鎴� + 灏忓尯鍧囦环锛�-鍏� + 鍔炲叕浜烘暟锛�-浜� + +
    + + +
    +
    +
    +
      +
    • 鏂版潙
    • +
    • 鏅�氬晢鍝佹埧
    • +
    • 楂樼骇鍟嗗搧鎴�
    • +
    • 鍐欏瓧妤�
    • +
    +
    +
    +
      +
    •  
    • +
    • 鍦ㄥ缓鏅�氬晢鍝佹埧
    • +
    • 鍦ㄥ缓楂樼骇鍟嗗搧鎴�
    • +
    • 鍦ㄥ缓鍐欏瓧妤�
    • +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    鐑害浣�
    +
    鐑害楂�
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    鏃�
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    鏃�
    +
    +
    + + + +
    +
    +
    +
    +
    + + +
    + + 璇峰厛纭畾闂ㄥ簵浣嶇疆 +
    + +
    +
    X
    +
    璇风偣鍑� 纭鍦板潃 鎴� 鎷栨嫿 鍒版偍闇�瑕佺殑鍦板潃鐒跺悗纭畾
    +
    + + +
    + 寮�鍚儹鍔涘浘 +
    +
      +
    • +
    • +
    • + <#--
    • --> + <#--
    • --> +
    +
    +
    + +
    + 寮�鍚綉鏍煎浘 + +
    +
      +
    • +
    • +
    • +
    +
    +
    + + + +
    +
    + +
    +
    +
    + + +
    +
    +
    + + + + + + + + + + + +

    +
    + + + + + + + + + + + + + + + + + + + + +