From 0517c8c731b1a514db7d4d26fddded9e88c4ed0a Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 10 Jun 2021 10:55:21 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/dealPrice/DealPriceMathBatch.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy index d9e3c9364..5c5aadd9e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dealPrice/DealPriceMathBatch.groovy @@ -54,6 +54,10 @@ class DealPriceMathBatch extends BaseBatch{ def flag = true; + + def startDate = DateUtil.getFirstDayOfMonth(new Date(),-1) + def endDate = DateUtil.getFirstDayOfMonth(new Date(), 1) + cityMap.each{city,alias-> println "开始加载【${city}】小区" if(city != "昆玉"){ @@ -61,10 +65,8 @@ class DealPriceMathBatch extends BaseBatch{ districtMap.putAll(detailMap) } } - def startDate = DateUtil.getFirstDayOfMonth(DateUtil.parseDate("2020-01-01","yyyy-MM-dd")) -// def startDate = DateUtil.getFirstDayOfMonth(new Date()) -// def endDate = DateUtil.getFirstDayOfMonth(new Date(), 1) - def endDate = DateUtil.getFirstDayOfMonth(DateUtil.parseDate("2021-04-30","yyyy-MM-dd")) +// def startDate = DateUtil.getFirstDayOfMonth(DateUtil.parseDate("2020-01-01","yyyy-MM-dd")) +// def endDate = DateUtil.getFirstDayOfMonth(DateUtil.parseDate("2021-04-30","yyyy-MM-dd")) while(flag){ println "开始加载解析数据......" From 1be296f789ffd51cf3305c827ba4cff76e0cb949 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 10 Jun 2021 11:08:53 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9D=87=E4=BB=B7=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=BB=8E=E5=90=8C=E6=AD=A5=E4=B8=8A=E4=B8=AA=E6=9C=88=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=EF=BC=8C=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy index c2ecb8014..ddfdcb661 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy @@ -76,7 +76,7 @@ class DistrictPriceExportBatch extends BaseBatch{ def createDatas(def city){ def districts = CommonDatautils.findAllDistricts(city, "district", null); - def lastDate = DateUtils.getLastDayOfMonth(new Date(), -1) + def lastDate = new Date() def startDate = DateUtils.getFirstDayOfMonth(lastDate); def result = [] From c5800012df538f016516a105c4f96e21de553950 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 10 Jun 2021 11:20:48 +0800 Subject: [PATCH 03/25] update --- .../com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy index ddfdcb661..87a2d9962 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy @@ -77,7 +77,7 @@ class DistrictPriceExportBatch extends BaseBatch{ def districts = CommonDatautils.findAllDistricts(city, "district", null); def lastDate = new Date() - def startDate = DateUtils.getFirstDayOfMonth(lastDate); + def startDate = DateUtils.getFirstDayOfMonth(lastDate, -1) def result = [] for(def rMap : districts){ From 809bfcb16f7c3593e6453b3866940d55ac44b1e7 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 10 Jun 2021 14:24:54 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=8A=93=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/gj/GaoDeMapCrawl.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index e93f98720..3fcc8cd67 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -127,7 +127,7 @@ class GaoDeMapCrawl extends BaseBatch{ q.put(prefix+"status", new BasicDBObject(QueryOperators.EXISTS, false)) // q.put("status", "失败") // q.put("traffic_status", new BasicDBObject(QueryOperators.EXISTS, false)) - def results = BOUNDS_COLL.find(q).batchSize(2000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + def results = BOUNDS_COLL.find(q).limit(2000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) return results; } @@ -140,7 +140,7 @@ class GaoDeMapCrawl extends BaseBatch{ // void run() { // try{ // totalCount.addAndGet(1) - searching(location) + searching(i, location) // }catch(Exception e){ // e.printStackTrace() // } finally { @@ -167,7 +167,7 @@ class GaoDeMapCrawl extends BaseBatch{ } } - def searching(location){ + def searching(i, location){ // def bound_gd = location.bound_gd // def lats = [bound_gd[1], bound_gd[3]] // def lngs = [bound_gd[0], bound_gd[2]] @@ -175,7 +175,7 @@ class GaoDeMapCrawl extends BaseBatch{ // lngs.sort() // println index // if(lngs[0]<=121.418153 && lngs[1]>=121.418153 && lats[0]<=31.218824 && lats[1]>=31.218824){ - search(location) + search(i, location) // } if(updateLists.size() > 0 && updateLists.size()>1000){ @@ -194,7 +194,7 @@ class GaoDeMapCrawl extends BaseBatch{ } - def search(location){ + def search(i, location){ def bound_gd = location.bound_gd def lats = [bound_gd[1], bound_gd[3]] def lngs = [bound_gd[0], bound_gd[2]] @@ -228,7 +228,7 @@ class GaoDeMapCrawl extends BaseBatch{ updateErrorLists.addAll(location) } // update(location); - println "[ "+totalCount.get()+" ]"+location._id+" "+location.city+" "+location.bound_gd+" flag: "+m.status + println "[ "+i+" ]"+location._id+" "+location.city+" "+location.bound_gd+" flag: "+m.status } def processData(rets){ From f61b4f786372dee76172035ef209c3aeabea9af4 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 10 Jun 2021 17:07:00 +0800 Subject: [PATCH 05/25] update --- .../com/fangjia/script/gj/GaoDeMapCrawl.groovy | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index 3fcc8cd67..129d15ed9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -108,14 +108,20 @@ class GaoDeMapCrawl extends BaseBatch{ def run(){//,"西安","重庆" -// def citys = [ "临沂","泰安","菏泽","东营","德州","济宁","日照","聊城","滨州","枣庄","莱芜","济南","青岛","威海","烟台","潍坊","淄博"] - def citys = ["重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] -// def citys = CommonUtils.findAllCity() +// def citys = ["重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] + def citys = CommonUtils.findAllCity() def totalCount = 0; for(def city : citys){ - def cityLations = findAllLation(city); - println "开始处理["+city +"]:"+cityLations.size() - gaoDeCitySearch(cityLations); + def stop = false + while(stop == false){ + def cityLations = findAllLation(city); + if(!cityLations){ + stop = true; + }else{ + println "开始处理["+city +"]:"+cityLations.size() + gaoDeCitySearch(cityLations); + } + } } } From a81ede278ec515a8d5e59d23a21c141b48dbd671 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 18 Jun 2021 16:21:05 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=8A=93=E5=8F=96=E6=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/gj/GaoDeMapCrawl.groovy | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index 129d15ed9..e07d6eff0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -47,10 +47,16 @@ class GaoDeMapCrawl extends BaseBatch{ def updateErrorLists = [] def flagLists = [] def index = 0 - def prefix = "district_" + // def categorys = ["141202", "141203"]//中学,小学 - def categorys = ["120000", "120200","120203","120300","120301","120302","120303","120304"]//住宅相关 + +// def prefix = "district_" +// def categorys = ["120000", "120200","120203","120300","120301","120302","120303","120304"]//住宅相关 + // def categorys = ["190301"]//道路相关 + + def prefix = "village_" + def categorys = ["190108","190109"]//村庄 def totalCount = new AtomicLong() static main(args) { @@ -108,8 +114,8 @@ class GaoDeMapCrawl extends BaseBatch{ def run(){//,"西安","重庆" -// def citys = ["重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] - def citys = CommonUtils.findAllCity() + def citys = ["重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] +// def citys = CommonUtils.findAllCity() def totalCount = 0; for(def city : citys){ def stop = false From 2d0b90b9e552c037c58a27014216a09377ced340 Mon Sep 17 00:00:00 2001 From: xuhe Date: Sat, 19 Jun 2021 19:26:29 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E9=98=BF=E9=87=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/AddressController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 96bbe097f..ffd9e0b9a 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 @@ -1768,7 +1768,7 @@ public class AddressController { matchParams.setProvince(model.getProvince()); // matchParams.setUseMap(true); - matchParams.setUseAliyunApi(true); + matchParams.setUseAliyunApi(false); // matchParams.setUseCrf(true); matchParams.setContainsLocation(model.isContainsLocation()); Building building = addressParserService.standard(matchParams); From d2e1b37b566578c608da5b59080ce6e0c01df33e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 29 Jun 2021 14:48:42 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E6=B5=99=E5=95=86=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/zsbank/BasicInfoDataSynch.groovy | 56 ++++++++++++++++++- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy index 69a998c48..4cdcf5656 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy @@ -9,6 +9,8 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.DBObject +import com.mongodb.QueryOperators + /** * 娴欏晢鏈湴鍖栭儴缃插悓姝ヨ剼鏈� */ @@ -186,8 +188,57 @@ class BasicInfoDataSynch extends BaseBatch{ println "[${fjTowns.size()}]涓埂闀囧悓姝ュ畬鎴�" } def synchDict(){ + def dbcursor = ZS_DICT_CONN.find(new BasicDBObject()).sort(new BasicDBObject("version",-1)).limit(1) + def maxObj = null + for(def dbo : dbcursor){ + maxObj = dbo + } + def version = 1 + if(maxObj && maxObj.version){ + version = maxObj.version + 1 + } + + def fjDicts = CommonDatautils.getAllDictionary() - def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject()) + + def deleteQuery = new BasicDBObject() + if(maxObj && maxObj.version){ + deleteQuery.put("version", maxObj.version) + }else{ + deleteQuery.put("version", new BasicDBObject(QueryOperators.EXISTS, false)) + } + ZS_DICT_CONN.remove(deleteQuery) + + if(fjDicts) { + def addDatas = [] + for (def fjDict : fjDicts) { + def udata = new BasicDBObject() + udata.put("cat",fjDict.cat) + udata.put("name",fjDict.name) + if(fjDict.address_components){ + udata.put("address_components", fjDict.address_components) + } + udata.put("status",0) + udata.put("update_date",new Date().getTime()) + udata.put("version", version) + udata.put("_id",fjDict._id) + addDatas << udata + if(addDatas.size()%10000==0){ + println addDatas.size()/10000 +" 10000" + ZS_DICT_CONN.insert(addDatas); + addDatas = []; + } + } + if(addDatas.size()>0){ + ZS_DICT_CONN.insert(addDatas); + addDatas = []; + } + } + + + + + /* def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject()) def zsDicts = [] def zsDictMap = [:] def fjDictMap = [:] @@ -205,6 +256,7 @@ class BasicInfoDataSynch extends BaseBatch{ udata.put("name",fjDict.name) udata.put("status",0) udata.put("update_date",new Date().getTime()) + udata.put("version", version) if(zsDictObj){ if(fjDict.cat!=zsDictObj.cat||fjDict.name!=zsDictObj.name||zsDictObj.status!=0){ ZS_DICT_CONN.update(new BasicDBObject("_id",zsDictObj._id), new BasicDBObject('$set',udata)) @@ -235,7 +287,7 @@ class BasicInfoDataSynch extends BaseBatch{ ZS_DICT_CONN.update(new BasicDBObject("_id",zsDict._id), new BasicDBObject('$set',udata)) } } - } + }*/ println "[${fjDicts.size()}]涓瓧鍏告暟鎹悓姝ュ畬鎴�" } def synchDistrict(cat){ From b252cfa765adf95db7bed378756f18c349d1e5fa Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 29 Jun 2021 14:49:20 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E6=8A=93=E5=8F=96?= =?UTF-8?q?=E9=81=93=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index e07d6eff0..844282d7e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -53,10 +53,11 @@ class GaoDeMapCrawl extends BaseBatch{ // def prefix = "district_" // def categorys = ["120000", "120200","120203","120300","120301","120302","120303","120304"]//住宅相关 -// def categorys = ["190301"]//道路相关 + def prefix = "road_" + def categorys = ["190301"]//道路相关 - def prefix = "village_" - def categorys = ["190108","190109"]//村庄 +// def prefix = "village_" +// def categorys = ["190108","190109"]//村庄 def totalCount = new AtomicLong() static main(args) { @@ -114,7 +115,7 @@ class GaoDeMapCrawl extends BaseBatch{ def run(){//,"西安","重庆" - def citys = ["重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","上海","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] + def citys = ["上海","重庆","哈尔滨","沈阳","东莞","南昌","昆明","金华","温州","淄博","湛江","肇庆","宜昌","岳阳","安庆","芜湖","西宁","日照","常德","张家口","北京","广州","深圳","重庆","郑州","长沙","西安","成都","东莞","佛山","杭州","合肥","南京","青岛","沈阳","苏州","天津","武汉","珠海","中山","长春","扬州","烟台","徐州","无锡","温州","太原","台州","石家庄","绍兴","厦门","泉州","宁波","南通","南宁","南昌","兰州","常州","大连","福州","贵阳","哈尔滨","海口","惠州","济南","嘉兴","金华","昆明","遵义","淄博","株洲","镇江","肇庆","漳州","湛江","岳阳","银川","宜昌","盐城","芜湖","乌鲁木齐","唐山","泰州","汕头","三亚","清远","秦皇岛","马鞍山","洛阳","柳州","连云港","廊坊","九江","吉林","淮安","湖州","呼和浩特","沧州","保定","安庆","张家口","西宁","日照","拉萨","锦州","大同","常德","北海","文昌","陵水","保亭"] // def citys = CommonUtils.findAllCity() def totalCount = 0; for(def city : citys){ From 6f50888ba8f606e4a28cd921569dda0fe49b58a2 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 29 Jun 2021 14:50:24 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E9=AB=98=E5=BE=B7key=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/gj/paimai/GaoDeUtils.groovy | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy index 81837c698..4313382e5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/GaoDeUtils.groovy @@ -502,18 +502,21 @@ class GaoDeUtils { } static String getRandomKey2() { - def KeyList = [ - "2af0b8533415a612b98d59bb93d664b9", - "0246c57bbcf24aa246c207b3c99dfe41", - "042328b3f0fa5daf426802d379521d87", - "055d4f1b5b64a2bce18f4fe1f15c2639", - "d5484f5170502405d88bbaffe1b496f0", - "e74ccc4258079d2200199695110cceb1", - "f58629fc799fbc8537ca85046c6d44a5", - "291073f17ee0b963ccb1927ed92bf265", - "2a1fb75990f2b39f6221e50892dd3988" - ] +// def KeyList = [ +// "2af0b8533415a612b98d59bb93d664b9", +// "0246c57bbcf24aa246c207b3c99dfe41", +// "042328b3f0fa5daf426802d379521d87", +// "055d4f1b5b64a2bce18f4fe1f15c2639", +// "d5484f5170502405d88bbaffe1b496f0", +// "e74ccc4258079d2200199695110cceb1", +// "f58629fc799fbc8537ca85046c6d44a5", +// "291073f17ee0b963ccb1927ed92bf265", +// "2a1fb75990f2b39f6221e50892dd3988" +// ] + def KeyList = [ + "10bcb421d2ee4e51ed9268d6dca58ad1" + ] def count = RandomUtils.nextInt(KeyList.size()) return KeyList.get(count); } From 7e89258b9ed9f34c8ac1f5eef4adb736066da8d5 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 5 Jul 2021 16:39:51 +0800 Subject: [PATCH 11/25] =?UTF-8?q?58=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy index 05d0c713e..53823ee85 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy @@ -166,8 +166,8 @@ class Esf58Crawl extends BaseBatch{ def addr = JQueryUtils.selectText(".desc", detailDocument); if(info){ if(info.size()>=4){ - city = info[2].replace("小区","") - region = info[3].replace("小区","") + city = info[2].replace("小区","").trim() + region = info[3].replace("小区","").trim() } } if(!addr){ @@ -212,8 +212,8 @@ class Esf58Crawl extends BaseBatch{ def saveThirdParty(metadata){ DBObject obj = new BasicDBObject(); obj.put("district_id", metadata.url); - obj.put("city", metadata.city); - obj.put("region", metadata.region); + obj.put("city", metadata.city.trim()); + obj.put("region", metadata.region.trim()); obj.put("block", metadata.block); obj.put("name", metadata.name); obj.put("s_date", SHORT_DATE); @@ -221,6 +221,7 @@ class Esf58Crawl extends BaseBatch{ obj.put("addres", metadata.address); obj.put("avg_price", metadata.avg_price.toInteger()); obj.put("c_date", new Date()); + println obj.toString() thirdPartyColl.save(obj); } From 72a3f78abe1688de5cb31684563ed15bd5eb3d46 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 5 Jul 2021 16:41:05 +0800 Subject: [PATCH 12/25] update --- .../com/fangjia/script/fuzhou/Test1.groovy | 122 +- .../fangjia/script/gj/LandDetailCrawl.groovy | 4 +- .../fangjia/script/gj/WuXiAddressTest.groovy | 90 ++ .../fangjia/script/gj/YouDaDataParser.groovy | 4 +- .../gj/district/FangjiaClientUtils.groovy | 16 + .../script/gj/district/ZsPersonProcess.groovy | 1146 +++++++++++++++++ .../script/gj/es/EsMonthHouseStat.groovy | 37 +- .../script/gj/location/LocationTest.groovy | 249 +++- .../script/gj/test/AddressStandard.groovy | 301 +++++ .../gj/test/CrawlDistrictIdSelect.groovy | 27 +- .../thirdPriceCrawl/SynchDistrictPrice.groovy | 19 +- .../TestCrawlTotalCount.groovy | 4 +- .../com/fangjia/script/util/ExcelUtils.groovy | 5 +- .../fangjia/script/util/OpenApiClient.groovy | 4 +- .../yinjihaun/amap/GaoDeApiUtils.groovy | 35 + 15 files changed, 1986 insertions(+), 77 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy index cf1e4950f..4e1922326 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy @@ -2,13 +2,19 @@ package com.fangjia.script.fuzhou import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.thirdPriceCrawl.CrawalDBUtil +import com.fangjia.script.util.CsvUtils +import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils +import com.fangjia.script.yinjihaun.util.DingDingMessageUtil import com.mongodb.BasicDBObject import com.mongodb.DBCollection - -def datas = ExcelUtils.read("d:\\数据\\福州\\福州4月2.xlsx",0,1) +//福州第三方均价统计,发送钉钉消息 +//def datas = ExcelUtils.read("d:\\数据\\福州\\福州4月2.xlsx",0,1) +//def datas = CsvUtils.read("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv"); +def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv") def count0 = 0 def count1 = 0 def count2 = 0 @@ -18,35 +24,44 @@ def count5 = 0 def count6 = 0 def count7 = 0 def count8 = 0 -def total=4943 +def count9 = 0 +def total = datas.size() +def regions = ["鼓楼","仓山","台江","晋安","马尾","长乐"] +def regionCount = 0 + +def rets = [] +rets << ["网站有对比价数量","有对比价楼盘量","有对比价占比"] for(def d : datas){ def list = [] - if(d['G']){ - list << d['G'] + if(regions.contains(d[3])){ + regionCount ++ } - if(d['H']){ - list << d['H'] + if(d[6]){ + list << d[6] } - if(d['I']){ - list << d['I'] + if(d[7]){ + list << d[7] } - if(d['J']){ - list << d['J'] + if(d[8]){ + list << d[8] } - if(d['K']){ - list << d['K'] + if(d[9]){ + list << d[9] } - if(d['L']){ - list << d['L'] + if(d[10]){ + list << d[10] } - if(d['M']){ - list << d['M'] + if(d[11]){ + list << d[11] } - if(d['N']){ - list << d['N'] + if(d[12]){ + list << d[12] } - if(d['O']){ - list << d['O'] + if(d[13]){ + list << d[13] + } + if(d[14]){ + list << d[14] } if(list.size()==0){ count0++ @@ -76,18 +91,53 @@ for(def d : datas){ if(list.size()==8){ count8++ } + if(list.size()==9){ + count9++ + } } -println("count0:"+ (DataHandleUtils.getDoubleRound(2, count0*100.0/total))) -println("count1:"+ (DataHandleUtils.getDoubleRound(2, count1*100.0/total))) -println("count2:"+ (DataHandleUtils.getDoubleRound(2, count2*100.0/total))) -println("count3:"+ (DataHandleUtils.getDoubleRound(2, count3*100.0/total))) -println("count4:"+ (DataHandleUtils.getDoubleRound(2, count4*100.0/total))) -println("count5:"+ (DataHandleUtils.getDoubleRound(2, count5*100.0/total))) -println("count6:"+ (DataHandleUtils.getDoubleRound(2, count6*100.0/total))) -println("count7:"+ (DataHandleUtils.getDoubleRound(2, count7*100.0/total))) -println("count8:"+ (DataHandleUtils.getDoubleRound(2, count8*100.0/total))) +println("总量:"+ total) +def pre1 = DataHandleUtils.getDoubleRound(2, count1*100.0/total) +println("count1:"+ pre1) +def pre2 = DataHandleUtils.getDoubleRound(2, count2*100.0/total) +println("count2:"+ pre2) +def pre3 = DataHandleUtils.getDoubleRound(2, count3*100.0/total) +println("count3:"+ pre3) +def pre4 = DataHandleUtils.getDoubleRound(2, count4*100.0/total) +println("count4:"+ pre4) + +def pre5 = DataHandleUtils.getDoubleRound(2, count5*100.0/total) +println("count5:"+ pre5) + +def pre6 = DataHandleUtils.getDoubleRound(2, count6*100.0/total) +println("count6:"+ pre6) + +def pre7 = DataHandleUtils.getDoubleRound(2, count7*100.0/total) +println("count7:"+ pre7) + +def pre8 = DataHandleUtils.getDoubleRound(2, count8*100.0/total) +println("count8:"+ pre8) + +def pre9 = DataHandleUtils.getDoubleRound(2, count9*100.0/total) +println("count9:"+ pre9) + +rets << ["1家",count1, pre1+"%"] +rets << ["2家",count2, pre2+"%"] +rets << ["3家",count3, pre3+"%"] +rets << ["4家",count4, pre4+"%"] +rets << ["5家",count5, pre5+"%"] +rets << ["6家",count6, pre6+"%"] +rets << ["7家",count7, pre7+"%"] +rets << ["8家",count8, pre8+"%"] +rets << ["9家",count9, pre9+"%"] + +def curMonth = DateUtils.formatDateByPattern(new Date(), "yyyyMM") +ExcelUtils.write("d:\\数据\\福州\\多方均价对比统计数据"+curMonth+".xlsx",rets,"统计") +def s = "第三方均价总量:${total}\n6区总量:${regionCount}\ncount1: "+ count1+"( "+pre1+"% )\ncount2: "+ count2+"( "+pre2+"% )\ncount3: "+count3+"( "+pre3+"% )\ncount4: "+count4+"( "+pre4+"% )\ncount5: "+count5+"( "+pre5+"% )\ncount6: "+count6+"( "+pre6+"% )\ncount7: "+count7+"( "+pre7+"%)\ncount8: "+count8+"( "+pre8+"% )\ncount9: "+count9+" ("+pre9+"% )" + +def access_token = "065f4a05d5f87eb39a9f9e048eeefb80c1f7560446f8926441de80453c160c60" +DingDingMessageUtil.sendTextMessage(access_token, s) ////def districts = CommonDatautils.findAllDistricts("福州", "district", ["city", "region", "name"]); @@ -128,6 +178,18 @@ println("count8:"+ (DataHandleUtils.getDoubleRound(2, count8*100.0/total))) //} +def readTxt(def fileName){ + File file = new File(fileName); + def rows = []; + + file.eachLine{ + def row = it.split("@\\|@",-1) + rows << row + } + return rows; +} + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy index 6a44c0463..29bd4df02 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LandDetailCrawl.groovy @@ -65,12 +65,12 @@ class LandDetailCrawl { } def updateData(){ - def datas = ExcelUtils.read("D:\\数据\\土地\\土地成交3月(2).xlsx",0, 1) + def datas = ExcelUtils.read("D:\\数据\\土地\\土地-21-06.xlsx",0, 1) if(datas && datas.size()>0){ for(def data : datas){ def id = data['A'] DBObject upMap = new BasicDBObject() - def area = data['E'] + def area = data['I'] if(area){ if(area){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy new file mode 100644 index 000000000..f8c8c0d5c --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/WuXiAddressTest.groovy @@ -0,0 +1,90 @@ +package com.fangjia.script.gj + +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils + +class WuXiAddressTest { + static main(args) { + def task = new WuXiAddressTest() + task.run() + } + + def run(){ +// def datas = ExcelUtils.read("D:\\数据\\无锡\\教育机构-标准化(已处理).xlsx",0,1) +// for(def d : datas){ +// def locationStr = getLocationInfo(d['D'], d['Q']) +// def township = getStreetInfo(locationStr) +// def name = getJuWeiHuiInfo(locationStr); +// +// } + + ExcelUtils.multiThreadingModify("D:\\数据\\无锡\\教育机构-标准化(已处理).xlsx",{d-> + if(!d['S']){ + def locationStr = getLocationInfo(d['D'], d['Q']) + def township = getStreetInfo(locationStr) + def name = getJuWeiHuiInfo(locationStr, "村委会", "1000"); + if(!name){ + name = getJuWeiHuiInfo(locationStr,"村委会", "2000"); + if(name){ + d['T'] = 2000 + } + }else{ + d['T'] = 1000 + } + + if(!name){ + name = getJuWeiHuiInfo(locationStr, "村委会", "3000"); + if(name){ + d['T'] = 3000 + } + } + d['R'] = township + d['S'] = name + } + + + },0) + + } + + def getLocationInfo(def city, def address){ + def gloJson = GaoDeApiUtils.geo(city, address) + if(gloJson) { + def glocation = null + if (gloJson && gloJson.get("geocodes")) { + def geocodes = gloJson.get("geocodes") + glocation = geocodes.get(0).location + } + return glocation + } + return null + } + + + def getStreetInfo(def glocation){ + def township = null + if(glocation){ + def jsonObject = GaoDeApiUtils.geocode(glocation) + if(jsonObject && jsonObject.regeocode) { + def addressComponent = jsonObject.regeocode.addressComponent + if(addressComponent){ + township = addressComponent.township + } + } + } + return township; + } + + def getJuWeiHuiInfo(def glocation, def keyword, def radius){ + def json = GaoDeApiUtils.around2(glocation, radius,keyword, null) + def name = null + if(json && json.info=="OK" && json.pois){ + def pois = json.pois + if(pois){ + def poi = pois[0] + name = poi.name + } + } + return name; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index 25c631832..0c2be14c8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -47,7 +47,7 @@ class YouDaDataParser { def final AtomicInteger count_ = new AtomicInteger(0) - static def statDate = "2021-04-01" + static def statDate = "2021-05-01" static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//友达一手房存入mongo @@ -285,7 +285,7 @@ class YouDaDataParser { def esfParser(){ - def files = ["D:\\数据\\友达\\2021年5月\\二手房\\查询1.DBF"] + def files = ["D:\\数据\\友达\\2021年6月\\二手房\\查询1.DBF"] def datas = [] for(def fileName : files){ def rows = readDBF(fileName); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index a131a414c..8eacf492b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -65,6 +65,22 @@ class FangjiaClientUtils { } + + public static def addressStand(def address){ + def jsonObj = null + try { + def url = "http://192.168.0.19:39080/FangJiaNlpService/ner?address="+URLEncoder.encode(address,"UTF-8") + +// def url = "http://192.168.0.19:39080/FangJiaAddressService/structure?address="+URLEncoder.encode(address,"UTF-8") + def content = new HttpRequest().newGet(url, null, "utf-8") + jsonObj = JSONObject.fromObject(content) + } catch (Exception e) { + e.printStackTrace(); + } + return jsonObj; + } + + public static Map JsonToMap(JSONObject json) { Map columnValMap = new HashMap(); Set jsonKeys = json.keySet(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy new file mode 100644 index 000000000..abb8e3ae9 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy @@ -0,0 +1,1146 @@ +package com.fangjia.script.gj.district + +import com.fangjia.core.RegionData +import com.fangjia.core.util.BaiDuApiUtils +import com.fangjia.core.util.GeocodeUtils +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.CosineSimilarAlgorithm +import com.fangjia.script.util.DataUtil +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.GeoHelper +import com.fangjia.script.util.MongoUtils +import com.fangjia.script.util.OpenApiClient +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import net.sf.json.JSONObject +import org.apache.commons.lang.StringUtils + +import java.util.regex.Matcher +import java.util.regex.Pattern + +class ZsPersonProcess { + + static final DBCollection FANGJIA_OFFICIAL_AREA_MAP = MongoUtils.getCollectionByName("business", "fangjia_official_area_map", "mongo.db.fangjia.com") + + static final String TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; + + static main(args) { + def task = new ZsPersonProcess() +// task.run() + +// task.parse() + +// def d= task.addressStandardize("成都","半岛城邦2期") +// if(d){ +// println "keywords:"+d.name+" street:"+d.street+" number:"+d.streetNumber +// } + +// def dist = ["city":"重庆", "region":"临海", "name":"伟星·金桥郡",address:""] +// if(dist.name){ +// def arrs = FangjiaClientUtils.getNlpKey(dist.name, 3) +// println "Name: "+arrs +// } +// if(dist.address){ +// def arrs = FangjiaClientUtils.getNlpKey(dist.address, 3) +// println "Address: "+arrs +// } +// def loactionMap = task.matchMap(dist) +// println loactionMap + +// task.matchMap() + +// task.matchDb() +// task.matchDb2() +// task.matchDb3() + + task.saveOrUpdate() + } + + def matchMap(){ +// def datas = ExcelUtils.read("d:\\数据\\浙商\\浙商人工.xlsx", 0,1) +// for(def d : datas){ +// if(d['U']){ +// def dist = ["city":d['U'], "region":d['V'], "name":d['G']] +// def loactionMap = matchMap(dist) +// if(loactionMap){ +// d['W'] = loactionMap.source +// d['E'] = loactionMap.region +// d['F'] = loactionMap.mapName +// d['H'] = loactionMap.address +// d['I'] = loactionMap.lng +// d['J'] = loactionMap.lat +// } +// } +// } + + ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工(单-恢复).xlsx", { d -> + if(d['U'] && !d['Y']){ + def name = null + def dist = [] + def loactionMap = null + if(d['W']){ + name = d['W'] + dist = ["city":d['U'], "region":d['V'], "name":name, "address":d['X']] + } + + loactionMap = matchMap(dist) + if(d['X'] && !d['X'].toString().endsWith("路") && !d['X'].toString().endsWith("街") && (!d['W'] || !loactionMap)){ + dist = ["city":d['U'], "region":d['V'], "name":d['X'], "address":null] + loactionMap = matchMap(dist) + } + + if(loactionMap){ + d['Y'] = loactionMap.source + d['Z'] = loactionMap.region + d['AA'] = loactionMap.mapName + d['AB'] = loactionMap.address + d['AC'] = loactionMap.lng + d['AD'] = loactionMap.lat + d['AE'] = loactionMap.score + d['AF'] = loactionMap.type + } + } + },0) + } + + + def parse(){ + def keywords = ["路","街","巷","大道"] +// def datas = ExcelUtils.read("d:\\数据\\浙商\\浙商人工.xlsx", 0,1) + ExcelUtils.modify("d:\\数据\\浙商\\浙商人工(单).xlsx",{d-> + if(!d['Y']){ + def str = d['G'] + + for(def key : keywords){ + if(d['G'].toString().endsWith(key)){ + str = d['H'] + } + } + + if(d['U']){ + def json = addressStandardize(d['U'],str.toString()) + + println "["+d['U']+" "+str +"] "+json + if(json){ + if(json.name){ + d['W'] = json.name + } + + if(json.street && json.streetNumber){ + d['X'] = json.street + json.streetNumber + }else if(json.street){ + d['X'] = json.street + } + } + + if(!d['X'] || (d['X'] && !d['X'].toString().contains("号"))){ + json = addressStandardize(d['U'], d['H'].toString()) + if(json){ + if(json.name){ + if(!d['W']){ + d['W'] = json.name + } + }else if(json.street && json.streetNumber){ + d['X'] = json.street + json.streetNumber + }else if(json.street){ + d['X'] = json.street + } + } + } + + println json + } + } + },0) + + + } + + def run(){ + ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工.xlsx",{d-> + + if(!d['S'] && !d['T']){ + def dbo = null + if(d['I']){ + def code = d['I'].toInteger().toString() + if(code.toString().length()==4){ + code = code+"00" + } + println "code:"+code + dbo = findRegionCodeValue(code) + if(dbo){ + d['T'] = dbo.province + d['U'] = dbo.fangjia_city + d['V'] = dbo.fangjia_district + } + } + if(!dbo){ + if(d['D']){ + def citycode = d['E'].toInteger().toString() + if(citycode.toString().length()==4){ + citycode = citycode+"00" + } + println "citycode:"+citycode + dbo = findCityCodeValue(d['D'].toInteger(), citycode) + if(!dbo){ + dbo = findCityCodeValue(d['D'], null) + } + }else{ + if(d['E'] && d['I']){ + def code1 = d['E'].toInteger().toString() + if(code1.toString().length()==4){ + code1 = code1+"00" + } + def code2 = d['I'].toInteger().toString() + if(code2.toString().length()==4){ + code2 = code2+"00" + } + println "code1:"+code1 +" code2:"+code2 + dbo = findCityCodeValue(code1, code2) + } + } + + if(dbo){ + if(dbo.province.contains('省')){ + d['T'] = dbo.province + d['U'] = dbo.fangjia_city + }else{ + d['T'] = dbo.fangjia_city + d['U'] = dbo.fangjia_city + } + } + } + } + + },0) + } + + public static JSONObject addressStandardize(String city, String address) { + if (StringUtils.isBlank(city) || StringUtils.isBlank(address)) { + throw new IllegalArgumentException(); + } + + try { + Map params = new HashMap(); + params.put("city", city); + params.put("address", address); + params.put("token", TOKEN); + String content = new HttpRequest().get("http://open.fangjia.com/address/standard", params, "utf-8") + JSONObject result = JSONObject.fromObject(content) + if (result.getInt("code") == 200) { + return result.getJSONObject("result"); + } else if (result.getInt("code") == 500) { + println("${city} ${address} ${result}") + } + } catch (Exception e) { + println("${city} ${address} ${e.getMessage()}") + e.printStackTrace(); + } + return null + } + + def findCityCodeValue(provinceCode, cityCode){ + def q = new BasicDBObject() + q.put("province_code", provinceCode.toString()) + if(cityCode){ + q.put("city_code", cityCode.toString()) + } + def dbcursor = FANGJIA_OFFICIAL_AREA_MAP.find(q) + def count = dbcursor.count() + if(count >1){ + def data = null + for(def db : dbcursor){ + data = db + break + } + return data; + } + } + + def findRegionCodeValue(value){ + def q = new BasicDBObject() + q.put("district_code", value.toString()) + def dbcursor = FANGJIA_OFFICIAL_AREA_MAP.find(q) + def count = dbcursor.count() + if(count == 1){ + def data = null + for(def db : dbcursor){ + data = db + break + } + return data; + } + return null + } + + def matchMap(def dist){ + def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "高德") + if(!gaodeRest && dist.address){ + gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.address,"住宅", "高德") + } + def gdlocationMap = null + def bdlocationMap = null + if(gaodeRest){ + gdlocationMap = getMapLocation2(dist, gaodeRest); + if(gdlocationMap){ + gdlocationMap.source = "高德" + } + } + + def baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "百度") + if(baiduRest){ + bdlocationMap = getMapLocation2(dist, baiduRest); + if(bdlocationMap){ + bdlocationMap.source = "百度" + } + } + + if(gdlocationMap && bdlocationMap){ + if(gdlocationMap.score>=bdlocationMap.score){ + return gdlocationMap + }else{ + return bdlocationMap + } + }else if(gdlocationMap){ + return gdlocationMap + }else if(bdlocationMap){ + return bdlocationMap + } + return null + } + + def getMapLocation(def dist, def rets){ + def lat = null + def lng = null + def region = null + def mapName = null + def address = null + def score = 0 + def type = null + def maxScore = 0 + for(def r : rets){ + if(!r.city){ + continue + } + if(!r.city.contains(dist.city)){ + continue + } + if(["公交车站"].contains(r.type)){ + continue + } + def name = nameReplace(r.name, dist.city) + + def distName = nameReplace(dist.name, dist.city) + + if(distName == name){ + lat = r.lat + lng = r.lng + mapName = r.name + region = r.district + address = r.address + type = r.type + + if(dist.region && r.district && r.district.contains(dist.region)){ + score = 10 + }else { + score = 5 + } + + }else{ + def word = null + if (name.length() >= distName.length()) { + word = name.replace(distName, "") + } else if (name.length() < distName.length()) { + word = dist.name.replace(name, "") + } + if (word) { + def words = ["商住楼", "小区","公寓","别墅","花园"] + for (def w : words) { + if (word == w ) { + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + address = r.address + type = r.type + if(r.district && dist.region && r.district.contains(dist.region)){ + score = 9 + }else { + score = 5 + } + break + } + } + if(!lng){ + Pattern pattern = Pattern.compile("\\d+号楼"); + Matcher matcher = pattern.matcher(word); + if(matcher.find()){ + def newWord = word.replace(matcher.group(),"") + if(!newWord){ + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + address = r.address + type = r.type + if(r.district && dist.region && r.district.contains(dist.region)){ + score = 8 + }else { + score = 5 + } + break + } + } + } + + if(!lng){ + Pattern pattern = Pattern.compile("[A-Za-z]区"); + Matcher matcher = pattern.matcher(word); + if(matcher.find()){ + def newWord = word.replace(matcher.group(),"") + if(!newWord){ + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + address = r.address + type = r.type + if(r.district && dist.region && r.district.contains(dist.region)){ + score = 7 + }else { + score = 5 + } + break + } + } + } + } + } + if(!lng && dist.address && (dist.address.contains("号") || dist.address.contains("弄") || dist.address.contains("交汇")) && r.address){ + if((r.address.contains("号") || r.address.contains("弄") || r.address.contains("交汇")) && r.address.contains(dist.address)){ + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + address = r.address + type = r.type + if(r.district && dist.region && r.district.contains(dist.region)){ + score = 8 + }else { + score = 5 + } + } + } + + if(lng){ + break + } + + if(!lng){ + def score1 = CosineSimilarAlgorithm.getSimilarity(name, distName)/2; + def score2 = 0.0 + def score3 = 0.0 + if(r.district && dist.region && r.district.contains(dist.region)){ + score3 = 0.2 + } + if(dist.address && r.address){ + score2 = CosineSimilarAlgorithm.getSimilarity(dist.address, r.address)/2 + } + score3 = com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, (score1 + score2)*10) + if(score3 >maxScore){ + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + address = r.address + type = r.type + score = score3 + maxScore = score3 + } + println dist.name +" "+ name+" "+dist.address +" "+r.address + " " +score3 + } + } + if(lng){ + return ["region":region, "lng":lng, "lat":lat, "mapName":mapName, "address":address, "score":score, "type":type] + } + return null + } + + + + def getMapLocation2(def dist, def rets){ + def data1 = findSimilarData(dist, rets, true) + def data2 = findSimilarData(dist, rets, false) + println data1 + println data2 + if(data1 && data1.score>1){ + return data1 + }else if(data2 && data2.score>1){ + return data2 + } + return null + } + + def findSimilarData(def dist, def rets, def regionImpr){ + def lat = null + def lng = null + def region = null + def mapName = null + def address = null + def score = 0 + def type = null + def maxScore = 0 + def standardName = null + for(def r : rets){ + if(!r.city){ + continue + } + if(!r.city.contains(dist.city)){ + continue + } + if(["公交车站"].contains(r.type)){ + continue + } + if(regionImpr && !r.district){ + continue + } + if(regionImpr && r.district && dist.region && !r.district.contains(dist.region) && !dist.region.contains(r.district)){ + continue + } + + def name = nameReplace(r.name, dist.city) + + def distName = nameReplace(dist.name, dist.city) + + def score3 = 0.0 + if(r.district && dist.region && r.district.contains(dist.region)){ + score3 = 0.2 + } + + def score1 = CosineSimilarAlgorithm.getSimilarity(name, distName)/2; + def score2 = 0.0 + if(dist.address && r.address){ + score2 = CosineSimilarAlgorithm.getSimilarity(dist.address, r.address)/2 + } + score3 = score1 + score2 + if(r.type && r.type.contains("住宅")){ + score3 = score3 + 0.2 + } + if(score3 >maxScore){ + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + standardName = name + address = r.address + type = r.type + score = com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, score3*10) + maxScore = score3 + } + println dist.name +" "+ name+" "+dist.address +" "+r.address + " " +score3 + + } + if(lng){ + return ["region":region, "lng":lng, "lat":lat, "mapName":mapName, "address":address, "score":score, "type":type, "standardName":standardName] + } + return null + } + + def nameReplace(def s, city){ + if(s.contains("(") && s.contains(")")){ + def s1 = s.toString().substring(s.indexOf("(")+1, s.indexOf(")")) + if(s1.contains("路")||s1.contains("街")||s1.contains("大道")){ + s = s.toString().substring(0, s.indexOf("(")) + } + } + def name = s.replace("?","").replace("-","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace("1区","一区").replace("2区","二区").replace("3区","三区").replace("4区","四区").replace("5区","五区").replace("6区","六区").replace("7区","七区").replace("8区","八区").replace("9区","九区").replace(" ","").replace("建设中","").replace("钢混","").trim() + if(name.startsWith(city)){ + def newName = name.replace(city+"市","").replace(city,"") + if(newName && newName=="花园"){ + return name + }else{ + name = newName + } + } + return name + } + + def matchDb(){ + ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\测试.xlsx",{d-> + if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6){ + def results = null + def name = null + if(d['U'] && d['Z'] && d['AA']){ + name = nameReplace(d['AA'], d['U']) + results = OpenApiClient.addressMatch(d['U'], name, "property", false, d['Z'], null) + } + + if((d['AB'] && results && results.precise<0) || !results){ + results = OpenApiClient.addressMatch(d['U'], d['AB'], "property", false, d['Z'], null) + } + + + if(results && results.precise>=0){ + d['AL'] = results.city + d['AM'] = results.district + d['AN'] = results.name + + println "输入:"+d['V']+" "+d['W']+" 地图:"+d['Z']+" "+d['AA']+" 匹配:"+results.district+" "+results.name + def alias = results.alias + if(!alias){ + alias = [] + } + if(!alias.contains(results.name)){ + alias << results.name + } + + if(d['V']!="东莞"){ + def distance = null + if(d['AC'] && d['AD']){ + def maplng = null + def maplat = null + if(d['Y'] && d['Y']=="高德"){ + def baidu = BaiDuApiUtils.geoconv(d['AC'].toDouble(), d['AD'].toDouble(), 3) + maplng = baidu.x + maplat = baidu.y + }else if(d['Y'] && d['Y']=="百度"){ + maplng = d['AC'] + maplat = d['AD'] + } + distance = GeoHelper.GetDistance(maplat, maplng, results.lat, results.lng) + } + + d['AQ'] = distance.toInteger() + + if(d['V']){//原始数据有区域 + if(results.district && d['Z'] && results.district==d['Z']){//结果与地图区域相同 + if(results.district==d['V']){ + if(alias.contains(name)){ + + if(d['W']){ + def oldName = nameReplace(d['W'], d['U']) + if(oldName!=name){ + def group1 = pattern(oldName) + def group2 = pattern(name) + if(group1!=group2){ + results = OpenApiClient.addressMatch(d['U'], oldName, "property", false, d['V'], null) + if(results && results.precise>=0 && results.district == d['V']){ + if(results.name!=oldName){ + if(results.alias && results.alias.contains(oldName)){ + d['AP'] = "已存在,区域相同" + }else{ + d['AP'] = "新增小区【"+oldName+"】" + } + }else{ + d['AP'] = "已存在,区域相同" + } + }else{ + d['AP'] = "新增小区【"+oldName+"】" + } + }else{ + if(!alias.contains(oldName)){ + d['AP'] = "添加别名【"+oldName+"】" + }else{ + d['AP'] = "已存在" + } + } + }else{ + if(results.district==d['V']){ + d['AP'] = "已存在" + } + } + }else{ + d['AP'] = "已存在,区域相同" + } + }else{ + def group = pattern(name) + if(group){ + d['AP'] = "新增小区【"+name+"】" + }else{ + d['AP'] = "添加别名【"+ d['W'] +"】" + } + } + }else{ +// def msg = "" +// def names = [] +// if(d['W'] && !alias.contains(d['W'])){ +// def fq = pattern(d['W']) +// if(fq){ +// msg = "添加小区【"+ d['AA'] +"】" +// }else{ +// names << d['W'] +// msg = "添加别名【"+ d['W'] +"】" +// } +// } + d['AP'] = "输入区域问题 " + } + }else{ + if(d['Z'] && d['V'] && d['Z']==d['V']){//结果与地图区域不同,输入与地图相同 + d['AP'] = "新增小区【"+d['AA']+"】" + }else{ + if(results.address && d['AB'] && results.address.contains("路") && results.address.contains("号")){ + if(d['AB'].contains("路") && d['AB'].contains("号") && results.address.contains(d['AB'])){ + d['AP'] = "库中区域存疑 " + }else{ + d['AP'] = "区域都不同,地址不同" + } + }else{ + d['AP'] = "区域地址存疑 " + } + } + } + }else{ + if(results.district && d['Z'] && results.district==d['Z']) {//结果与地图区域相同 + if(!alias.contains(name)){ + def group1 = pattern(name) + if(group1 && name==d['W']){ + d['AP'] = "新增小区【"+d['AA']+"】" + }else if(group1 && d['X'] && d['AB'] && d['X'].contains("路") && d['X'].contains("号") && d['AB'].contains("路") && d['AB'].contains("号") && d['AB'].contains(d['X'])){ + d['AP'] = "新增小区【"+d['AA']+"】 添加别名【"+d['W']+"】" + } + }else{ + d['AP'] = "区域缺失,名称存在" + } + } + + } + }else{ + d['AP'] = "城市需特殊处理" + } + + + + }else{ + d['AP'] = "新增小区【"+d['AA']+"】" + } + } + },0) + } + + + def matchDb2(){ + ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工(单-测试入库-全).xlsx",{d-> + if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6){ + def results = null + def name = null + if(d['U'] && d['Z'] && d['AA']){ + name = nameReplace(d['AA'], d['U']) + results = OpenApiClient.addressMatch(d['U'], name, "property", false, d['Z'], null) + } + + if((d['AB'] && results && results.precise<0) || !results){ + results = OpenApiClient.addressMatch(d['U'], d['AB'], "property", false, d['Z'], null) + } + + + if(results && results.precise>=0){ + d['AL'] = results.city + d['AM'] = results.district + d['AN'] = results.name + + println "输入:"+d['V']+" "+d['W']+" 地图:"+d['Z']+" "+d['AA']+" 匹配:"+results.district+" "+results.name + + if(d['V']!="东莞"){ + def alias = results.alias + if(!alias){ + alias = [] + } + if(!alias.contains(results.name)){ + alias << results.name + } + + def distance = null + if(d['AC'] && d['AD']){ + def maplng = null + def maplat = null + if(d['Y'] && d['Y']=="高德"){ + def baidu = BaiDuApiUtils.geoconv(d['AC'].toDouble(), d['AD'].toDouble(), 3) + maplng = baidu.x + maplat = baidu.y + }else if(d['Y'] && d['Y']=="百度"){ + maplng = d['AC'] + maplat = d['AD'] + } + distance = GeoHelper.GetDistance(maplat, maplng, results.lat, results.lng) + } + + d['AQ'] = distance.toInteger() + +// if(d['V']){//原始数据有区域 + if(distance>5000){ + if(results.district && d['Z'] && results.district==d['Z']){ + if(alias.contains(name)){ + + }else{ + d['AP'] = "新增小区【"+d['AA']+"】" + } + }else{ + d['AP'] = "新增小区【"+d['AA']+"】" + } + + }else{ + + } + + }else{ + d['AP'] = "城市需特殊处理" + } + }else{ + d['AP'] = "新增小区【"+d['AA']+"】" + } + } + },0) + } + + + def getOptMsg(def d, def name, def results){ + def msg = "" + if(results.district && d['Z'] && results.district==d['Z']){//结果与地图区域相同 + if(alias.contains(name)){ + + if(d['W']){ + def oldName = nameReplace(d['W'], d['U']) + if(oldName!=name && !alias.contains(oldName)){ + def group1 = pattern(oldName) + def group2 = pattern(name) + if(group1 && group1!=group2){ + results = OpenApiClient.addressMatch(d['U'], oldName, "property", false, d['V'], null) + if(results && results.precise>=0 && results.district == d['V']){ + if(results.name!=oldName){ + if(results.alias && results.alias.contains(oldName)){ + msg = "已存在,区域相同" + }else{ + msg = "新增小区【"+d['W']+"】" + } + }else{ + msg = "已存在,区域相同" + } + }else{ + msg = "新增小区【"+d['W']+"】" + } + }else{ + if(results.district!=d['V']){ + msg = "输入区域问题" + }else{ + msg = "添加别名【"+ d['W'] +"】" + } + + } + }else{ + if(results.district==d['V']){ + msg = "已存在" + }else{ + msg = "输入区域问题" + } + } + }else{ + msg = "已存在,输入无名称" + } + + }else{ + def group = pattern(name) + if(group){ + msg = "新增小区【"+name+"】" + if(d['W']){ + def oldName = nameReplace(d['W'], d['U']) + if(oldName==name){ + if(d['V'] != d['Z']){ + msg = msg +" 输入区域问题" + } + } + } + + }else{ + if(distance>1000){ + if(d['W'] && results.address && d['AB'] && d['AB'].contains(results.address)){ + msg = "添加别名【"+ d['W'] +"】" + }else{ + if(d['X'] && d['AB'] && d['X'].contains("路") && d['X'].contains("号") && d['AB'].contains("路") && d['AB'].contains("号") && d['AB'].contains(d['X'])){ + msg = "新增小区【"+d['AA']+"】" + } + } + }else{ + msg = "添加别名【"+ d['W'] +"】" + } + + } + d['AP'] = msg + } + }else{ + msg = "区域不同,距离相近" + if(!alias.contains(name)){ + def group = pattern(name) + if(group){ + msg = msg +" 新增小区【"+d['AA']+"】" + }else{ + msg = msg + " 添加别名【"+ d['W'] +"】" + } + } + } + return msg; + } + + def matchDb3(){ + ExcelUtils.multiThreadingModify("d:\\数据\\浙商\\浙商人工(单-测试入库-全).xlsx",{d-> + if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6){ + def results = null + def name = null + if(d['U'] && d['Z'] && d['AA']){ + name = nameReplace(d['AA'], d['U']) + results = OpenApiClient.addressMatch(d['U'], name, "property", false, d['Z'], null) + } + + if((d['AB'] && results && results.precise<0) || !results){ + results = OpenApiClient.addressMatch(d['U'], d['AB'], "property", false, d['Z'], null) + } + + + if(results && results.precise>=0){ + d['AL'] = results.city + d['AM'] = results.district + d['AN'] = results.name + + println "输入:"+d['V']+" "+d['W']+" 地图:"+d['Z']+" "+d['AA']+" 匹配:"+results.district+" "+results.name + + if(d['V']!="东莞"){ + def alias = getAllAlias(results) + def distance = calcuteDistance(d, results.lat, results.lng) + d['AO'] = distance.toInteger() + + def score1 = com.fangjia.script.common.DataHandleUtils.getDoubleRound(2, CosineSimilarAlgorithm.getSimilarity(name, results.name)*10) + d['AP'] = score1 + if(distance>5000){ + def group = pattern(name) + if(group){ + if(alias.contains(name)){ + d['AQ'] = "已存在[距离远]" + }else{ + d['AQ'] = "新增【"+d['AA']+"】[距离远]" + } + }else{ + if(results.district==d['Z'] && score1>7){ + d['AQ'] = "已存在[距离远]" + if(results.district!=d['V']){ + d['AQ'] = "已存在[距离远][输入区域有误]" + } + }else if(score1<=3){ + d['AQ'] = "匹配可疑[距离远]" + }else{ + d['AQ'] = "其它可疑[距离远]" + } + } + }else{ + + if(results.district==d['Z'] && score1>7){ + d['AQ'] = "已存在[距离近]" + if(results.district!=d['V']){ + d['AQ'] = "已存在[距离近][输入区域有误]" + } + + }else if(score1<=3){ + d['AQ'] = "匹配可疑[距离近]" + }else if(score1>3 && score1<=7){ + if(distance<1000){ + if(alias.contains(name)){ + d['AQ'] = "已存在[距离近]" + if(results.district!=d['V']){ + d['AQ'] = "已存在[距离近][输入区域有误]" + } + }else{ + d['AQ'] = "加别名[距离近]" + if(results.district!=d['V']){ + d['AQ'] = "加别名[距离近][输入区域有误]" + } + def group = pattern(name) + def group1 = pattern(results.name) + if(group && group!=group1){ + d['AQ'] = "加别名[距离近][分期]" + } + } + }else{ + d['AQ'] = "待定" + if(results.address && d['AB'] && d['AB'].contains(results.address)){ + d['AQ'] = "加别名[距离近][路相关]" + } + } + }else if(results.district!=d['Z'] && score1>7){ + d['AQ'] = "[距离近][区域不同]" + def group = pattern(name) + def group1 = pattern(results.name) + if(group && group!=group1){ + d['AQ'] = "[距离近][区域不同][分期]" + } + } + } + }else{ + d['AQ'] = "城市需特殊处理" + } + }else{ + d['AQ'] = "新增小区【"+d['AA']+"】" + } + } + },0) + } + + + def saveOrUpdate(){ + def dists =[] + def rows = [] + ExcelUtils.modify("d:\\数据\\浙商\\浙商人工(单-测试入库-全).xlsx",{d-> + if(d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger()==6) { + if(d['AQ'] && d['AQ'].contains("新增")){ + if(d['U'] && d['Z'] && d['AA']){ + def name = nameReplace(d['AA'], d['U']) + def key = d['U']+"##"+d['Z']+"##"+name + if(!dists.contains(key)){ + dists << key + def address = DataUtil.formateAddress(d['U'], d['AB']) + def lat2 = null + def lng2 = null + def lat = null + def lng = null + if(d['Y']=="高德"){ + lng = (d['AC'].toDouble()*10000000000).longValue() + lat = (d['AD'].toDouble()*10000000000).longValue() + def gmap = GeocodeUtils.getGaodeToBaidu(d['AC'].toDouble(), d['AD'].toDouble()) + if(gmap){ + lng2 = (gmap.get("lng")*10000000000).longValue() + lat2 = (gmap.get("lat")*10000000000).longValue() + } + }else if(d['Y']=="百度"){ + lng2 = (d['AC'].toDouble()*10000000000).longValue() + lat2 = (d['AD'].toDouble()*10000000000).longValue() + def gmap = GeocodeUtils.geoconvBaiduToGoogle(d['AC'].toDouble(), d['AD'].toDouble()) + if(gmap){ + lng = (gmap.get("lng")*10000000000).longValue() + lat = (gmap.get("lat")*10000000000).longValue() + } + } + def estateType = "普通住宅" + if(d['AF']){ + if(d['AF'].contains("别墅")){ + estateType = "别墅" + }else if(d['AF'].contains("商住")){ + estateType = "商住" + } + } + def alias = [] + if(d['AG'] && d['AG']!=name){ + alias << d['AG'] + } + rows << [d['U'], d['Z'], name, address, estateType, lng, lat, lng2, lat2, alias] + } + } + } + } + },0) + + + + for(def row : rows){ + + def isRegion = RegionData.isRegion(row[0], row[1]) + if(isRegion){ + def obj = findData(row[0], row[1], row[2]) + if(!obj){ + obj = CommonDatautils.findDistrictByAlias(row[0], row[1], row[2], "district") + } + if(!obj){ + //saveData(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9]) + //FangjiaClientUtils.sendDistrictPriceCalculate(row[0], row[1], row[2], 4); + println "【新增】 ${row[0]} ${row[1]} ${row[2]}" + }else{ + println "【已存在】 ${row[0]} ${row[1]} ${row[2]}" + } + }else{ + println "区域不能标准化 -- ${row[0]} ${row[1]} ${row[2]}" + } + + } + + println "【add】"+dists.size() + + } + + def findData(city, region, newName){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("name", newName) + q.put("status", 0) + q.put("cat", "district") + return DbUtils.seaweed.findOne(q) + } + + def saveData(city, region, newName, newAddress, estateType, lng2, lat2, lng, lat, alias){ + def d = new BasicDBObject() + d.put("city", city) + d.put("region", region) + d.put("name", newName) + if(alias){ + d.put("alias", alias) + } + + if(newAddress){ + d.put("address", newAddress) + } + + if(estateType){ + d.put("estate_type2", estateType) + } + d.put("status", 0) + d.put("cat", "district") + + d.put("c_date", new Date()) + d.put("m_date", new Date()) + def markMap = [:] + markMap.put("data_source", "机器入库") + d.put("mark_map",markMap) + + d.put("lat", lat) + d.put("lat2", lat2) + d.put("lng", lng) + d.put("lng2", lng2) + DbUtils.seaweed.save(d) + return d; + } + + def getAllAlias(def results){ + def alias = results.alias + if(!alias){ + alias = [] + } + if(!alias.contains(results.name)){ + alias << results.name + } + return alias + } + + def calcuteDistance(d, dbLat, dbLng) { + def distance = null + if(d['AC'] && d['AD']){ + def maplng = null + def maplat = null + if(d['Y'] && d['Y']=="高德"){ + def baidu = BaiDuApiUtils.geoconv(d['AC'].toDouble(), d['AD'].toDouble(), 3) + maplng = baidu.x + maplat = baidu.y + }else if(d['Y'] && d['Y']=="百度"){ + maplng = d['AC'] + maplat = d['AD'] + } + distance = GeoHelper.GetDistance(maplat, maplng, dbLat, dbLng) + } + return distance; + } + def pattern(def s){ + Pattern pattern = Pattern.compile("(东|南|北|西|甲|乙|丙|丁|一|二|三|四|五|六|七|八|九|十|东|南|西|北|\\w)+(期|区|街区)") + def matcher = pattern.matcher(s) + if(matcher.find()){ + return matcher.group(); + } + return null + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy index 7860afad9..d8c7e72a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy @@ -18,8 +18,10 @@ class EsMonthHouseStat { static main(args) { def task = new EsMonthHouseStat() // task.run() - task.tradeRun() +// task.tradeRun() // task.houseRun() + + task.statHouseUpdateCount() } def run(){ @@ -233,4 +235,37 @@ class EsMonthHouseStat { rMap.total_new = rets.size() return rMap } + + + def statHouseUpdateCount(){ + def citys = CommonDatautils.findAllCity() + def root = "lianjia.com" + def rets = [] + rets << ["城市", "5月上旬","5月中旬","5月下旬", "6月前10天"] + for(def city : citys){ + def count1 = findHouseCount(city, root, 20210501, 20210510) + def count2 = findHouseCount(city, root, 20210510, 20210520) + def count3 = findHouseCount(city, root, 20210520, 20210530) + def count4 = findHouseCount(city, root, 20210601, 20210610) + rets << [city, count1, count2, count3, count4] + } + ExcelUtils.write("d:\\数据\\房源分析\\城市房源分析.xlsx", rets, "数据") + } + + + def findHouseCount(def city, def root, def startDate, def endDate){ + def aliasStr = null; + def total = 0 + try{ + String sql = "select count(*) as c from latest_seawater where cat='sell' and city='${city}' and p_date >= ${startDate} and p_date<${endDate} and root='${root}'" + + ElasticUtils.executeSqlQuery(sql,{data-> + total = data.c + }) + }catch(Exception e){ + e.printStackTrace() + } + + return total + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy index 55e0943ab..e75f561b2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy @@ -1,11 +1,14 @@ package com.fangjia.script.gj.location import com.fangjia.core.RegionData +import com.fangjia.core.util.BaiDuApiUtils +import com.fangjia.core.util.GeocodeUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.district.FangjiaClientUtils import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.looplineinfo.Point import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.GeoHelper import com.fangjia.script.util.MongoUtils @@ -21,9 +24,16 @@ class LocationTest { static DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline") static main(args) { - def task = new LocationTest() + Date date=new Date(1622802609); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String str = format.format(date); + System.out.println(str); + +// def task = new LocationTest() // task.run() - task.run2() +// task.run2() +// task.run3() +// task.run4() } def run(){ @@ -43,11 +53,14 @@ class LocationTest { def loactionMap = matchMap(dist) if(loactionMap){ - ret << "地图" + ret << loactionMap.source ret << loactionMap.region ret << loactionMap.mapName + ret << loactionMap.address def distance = GeoHelper.GetDistance(dist.lat/10000000000.0, dist.lng/10000000000.0, loactionMap.lat, loactionMap.lng) ret << distance + ret << loactionMap.lng + ret << loactionMap.lat if(dist.region==loactionMap.region){ println index+" "+dist.region +" "+dist.name +" 不在区域范围内,与地图相同" }else{ @@ -61,31 +74,188 @@ class LocationTest { } } - ExcelUtils.write("d:\\数据\\福州\\区域经纬度错误3.xlsx", rets, "区域不在行政范围内") + ExcelUtils.write("d:\\数据\\福州\\区域经纬度错误5.xlsx", rets, "区域不在行政范围内") } def run2(){ - ExcelUtils.multiThreadingModify("d:\\数据\\福州\\福州小区.xlsx") + def datas = ExcelUtils.read("d:\\数据\\福州\\福州小区.xlsx", 0,1) + def rets = [] + rets << ["城市", "区域", "名称", "来源","地图区域", "地图名称","距离", "地图地址", "地图经度", "地图纬度"] + def index = 0 + for(def d : datas){ + def count = d['H'].toInteger() + def label = d['G'].toInteger() + if(count && count>=4 && label!=-1){ + index++ + def city = d['C'] + def region = d['D'] + def name = d['B'] + + def dist = CommonDatautils.queryDistrictById(d['A'].toString()) + def ret = [] + ret << city + ret << region + ret << name + + def loactionMap = matchMap(dist) + if(loactionMap){ + ret << loactionMap.source + ret << loactionMap.region + ret << loactionMap.mapName + def distance = null + if(loactionMap.source=="高德"){ + distance = GeoHelper.GetDistance(dist.lat/10000000000.0, dist.lng/10000000000.0, loactionMap.lat, loactionMap.lng) + }else if(loactionMap.source=="百度"){ + distance = GeoHelper.GetDistance(dist.lat2/10000000000.0, dist.lng2/10000000000.0, loactionMap.lat, loactionMap.lng) + } + ret << distance + ret << loactionMap.address + ret << loactionMap.lng + ret << loactionMap.lat + if(dist.region==loactionMap.region){ + println index+" "+dist.region +" "+dist.name +" 不在区域范围内,与地图相同" + }else{ + println index+" "+dist.region +" "+dist.name +" 不在区域范围内 地图:"+ loactionMap.region+" "+distance + } + }else{ + // ret << "" + println index+" "+dist.region +" "+dist.name +" 不在区域范围内,地图没找到" + } + + rets << ret + } + } + + ExcelUtils.write("d:\\数据\\福州\\相同经纬度小区4.xlsx", rets, "数据") + + } + + + + def run3(){ + ExcelUtils.modify("d:\\数据\\福州\\区域经纬度错误5.xlsx", {d-> + def distance = null + if(d['G']){ + distance = d['G'].toDouble() + } + if(d['E'] && d['B'] == d['E'] && distance && distance>=1000){ + def mapName = d['F'].toString().replace("(建设中)","").replace("?","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期") + if(mapName.contains("-") && mapName.endsWith("楼")){ + mapName = mapName.substring(0, mapName.indexOf("-")) + } + if(d['C']==mapName){ + def q = new BasicDBObject() + q.put("city", d['A']) + q.put("region", d['B']) + q.put("name", d['C']) + q.put("cat", 'district') + q.put("status", 0) + def lng2 = null + def lat2 = null + def lng = null + def lat = null + if(d['D']=="高德"){ + lng = (d['I'].toDouble()*10000000000).longValue() + lat = (d['J'].toDouble()*10000000000).longValue() + def gmap = GeocodeUtils.getGaodeToBaidu(d['I'].toDouble(), d['J'].toDouble()) + if(gmap){ + lng2 = (gmap.get("lng")*10000000000).longValue() + lat2 = (gmap.get("lat")*10000000000).longValue() + } + + }else{ + lng2 = (d['I'].toDouble()*10000000000).longValue() + lat2 = (d['J'].toDouble()*10000000000).longValue() + def gmap = GeocodeUtils.geoconvBaiduToGoogle(d['I'].toDouble(), d['J'].toDouble()) + if(gmap){ + lng = (gmap.get("lng")*10000000000).longValue() + lat = (gmap.get("lat")*10000000000).longValue() + } + } + def udata = new BasicDBObject() + udata.put("lng", lng) + udata.put("lat", lat) + udata.put("lng2", lng2) + udata.put("lat2", lat2) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + + + def dbo = DbUtils.seaweed.findOne(q) + d['K'] = "修正" + + } + } + },0) + + } + + + def run4(){ + ExcelUtils.modify("d:\\数据\\福州\\福州相同经纬度小区4.xlsx", {d-> + def region = d['B'] + def name = d['C'] + if(!d['K']){ + def dist = ["city":d['A'], "region":region, "name":name] + def loactionMap = matchMap(dist) + if(loactionMap){ + d['D'] << loactionMap.source + d['E'] << loactionMap.region + d['F'] << loactionMap.mapName + def distance = null + if(loactionMap.source=="高德"){ + distance = GeoHelper.GetDistance(dist.lat/10000000000.0, dist.lng/10000000000.0, loactionMap.lat, loactionMap.lng) + }else if(loactionMap.source=="百度"){ + distance = GeoHelper.GetDistance(dist.lat2/10000000000.0, dist.lng2/10000000000.0, loactionMap.lat, loactionMap.lng) + } + d['G'] << distance + d['H'] << loactionMap.address + d['I'] << loactionMap.lng + d['J'] << loactionMap.lat + if(dist.region==loactionMap.region){ + println index+" "+dist.region +" "+dist.name +" 不在区域范围内,与地图相同" + }else{ + println index+" "+dist.region +" "+dist.name +" 不在区域范围内 地图:"+ loactionMap.region+" "+distance + } + }else{ + // ret << "" + println index+" "+dist.region +" "+dist.name +" 不在区域范围内,地图没找到" + } + } + },0) } def matchMap(def dist){ def gaodeRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "高德") - def locationMap = null + def gdlocationMap = null + def bdlocationMap = null if(gaodeRest){ - locationMap = getMapLocation(dist, gaodeRest); - if(locationMap){ - return locationMap + gdlocationMap = getMapLocation(dist, gaodeRest); + if(gdlocationMap){ + gdlocationMap.source = "高德" } } - def baiduRest = null - if (!locationMap) { - baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "百度") - } + def baiduRest = FangjiaClientUtils.searchMapData(dist.city, dist.name,"住宅", "百度") if(baiduRest){ - locationMap = getMapLocation(dist, baiduRest); + bdlocationMap = getMapLocation(dist, baiduRest); + if(bdlocationMap){ + bdlocationMap.source = "百度" + } } - return locationMap + + if(gdlocationMap && bdlocationMap){ + if(gdlocationMap.score>=bdlocationMap.score){ + return gdlocationMap + }else{ + return bdlocationMap + } + }else if(gdlocationMap){ + return gdlocationMap + }else if(bdlocationMap){ + return bdlocationMap + } + return null } def getMapLocation(def dist, def rets){ @@ -93,6 +263,8 @@ class LocationTest { def lng = null def region = null def mapName = null + def address = null + def score = 0 for(def r : rets){ if(!r.city){ continue @@ -100,12 +272,20 @@ class LocationTest { if(!r.city.contains(dist.city)){ continue } - def name = r.name.replace("?","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace(" ","").trim() + def name = r.name.replace("?","").replace("&","").replace("·","").replace(".","").replace("(","").replace(")","").replace("(","").replace(")","").replace("【","").replace("】","").replace("11期","十一期").replace("12期","十二期").replace("13期","十三期").replace("14期","十四期").replace("15期","十五期").replace("16期","十六期").replace("17期","十七期").replace("18期","十八期").replace("19期","十九期").replace("10期","十期").replace("1期","一期").replace("2期","二期").replace("3期","三期").replace("4期","四期").replace("5期","五期").replace("6期","六期").replace("7期","七期").replace("8期","八期").replace("9期","九期").replace(" ","").replace("建设中","").replace("钢混","").trim() if(dist.name == name){ lat = r.lat lng = r.lng mapName = r.name region = r.district + address = r.address + + if(r.district.contains(dist.region)){ + score = 10 + }else { + score = 5 + } + }else{ def word = null if (name.length() >= dist.name.length()) { @@ -116,11 +296,18 @@ class LocationTest { if (word) { def words = ["商住楼", "小区","公寓","别墅"] for (def w : words) { - if (word == w) { + if (word == w ) { lat = r.lat lng = r.lng region = r.district mapName = r.name + address = r.address + + if(r.district.contains(dist.region)){ + score = 9 + }else { + score = 5 + } break } } @@ -132,6 +319,30 @@ class LocationTest { lng = r.lng region = r.district mapName = r.name + address = r.address + if(r.district.contains(dist.region)){ + score = 8 + }else { + score = 5 + } + break + } + } + + if(!lng){ + Pattern pattern = Pattern.compile("[A-Za-z]区"); + Matcher matcher = pattern.matcher(word); + if(matcher.find()){ + lat = r.lat + lng = r.lng + region = r.district + mapName = r.name + address = r.address + if(r.district.contains(dist.region)){ + score = 7 + }else { + score = 5 + } break } } @@ -142,10 +353,8 @@ class LocationTest { } } if(lng){ - return ["region":region, "lng":lng, "lat":lat, "mapName":mapName] + return ["region":region, "lng":lng, "lat":lat, "mapName":mapName, "address":address, "score":score] } - - return null } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy new file mode 100644 index 000000000..a5cbbabbf --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/AddressStandard.groovy @@ -0,0 +1,301 @@ +package com.fangjia.script.gj.test + +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.gj.district.FangjiaClientUtils +import com.fangjia.script.util.ExcelUtils + +import java.util.concurrent.atomic.AtomicInteger + +class AddressStandard { + static main(args) { + def task = new AddressStandard() + task.run()//地址标准化 + task.test()//统计标准化后的结果 + + } + + def run2(){ + ExcelUtils.multiThreadingModify("d://数据//地址标准化//阿里接口拆分数据(1).xlsx",{d-> + def json = FangjiaClientUtils.addressStand(d['A']) + + if(json && json.status!=0){ + println d['A'] +" "+json + } + },0) + } + + def run(){ + // def datas = ExcelUtils.read("d://数据//地址标准化//阿里接口拆分数据(1-test).xlsx",0,1) + + + ExcelUtils.multiThreadingModify("d://数据//地址标准化//阿里接口拆分数据(1).xlsx",{d-> + if(d['A']){ + for(def i=18;i + total.addAndGet(1) + def sameCount = 0 + def list = [] + def a_prov = d['B']?d['B']:"" + if(a_prov && (a_prov.toString().endsWith("省") || a_prov.toString().endsWith("自治区"))){ + a_prov = a_prov.replace("维吾尔自治区","").replace("回族自治区","").replace("壮族自治区","").replace("自治区省","").replace("自治区","").replace("省","") + } + def b_prov = d['S']?d['S']:"" + if(b_prov && (b_prov.toString().endsWith("省") || b_prov.toString().endsWith("自治区"))){ + b_prov = b_prov.replace("维吾尔自治区","").replace("回族自治区","").replace("壮族自治区","").replace("自治区省","").replace("自治区","").replace("省","") + } + if(a_prov == b_prov){ + provCount.addAndGet(1) + sameCount++ + }else{ + list << "prov" + } + + def a_city = d['C']?d['C']:"" + def b_city = d['T']?d['T']:"" + if(a_city && a_city.toString().endsWith("市")){ + a_city = a_city.replace("市","") + } + if(b_city && b_city.toString().endsWith("市")){ + b_city = b_city.replace("市","") + } + if(a_city == b_city){ + cityCount.addAndGet(1) + sameCount++ + }else{ + list << "city" + } + + def a_dist = d['D']?d['D']:"" + def b_dist = d['U']?d['U']:"" + if(a_dist && (a_dist.endsWith("区")||a_dist.endsWith("县"))){ + a_dist = a_dist.replace("新区","").replace("区","").replace("县","") + } + if(b_dist && (b_dist.endsWith("区")||b_dist.endsWith("县"))){ + b_dist = b_dist.replace("新区","").replace("区","").replace("县","") + } + + if(a_dist == b_dist){ + distCount.addAndGet(1) + sameCount++ + }else{ + list << "dist" + } + + def a_town = d['E']?d['E']:"" + def b_town = d['V']?d['V']:"" + if(a_town==b_town){ + townCount.addAndGet(1) + sameCount++ + }else{ + list << "town" + } + + + + def a_road = d['F']?d['F']:"" + def b_road = d['X']?d['X']:"" + if(a_road == b_road){ + roadCount.addAndGet(1) + sameCount++ + }else{ + list << "road" + } + + + def a_roadno = d['H']?d['H']:"" + def b_roadno = d['Y']?d['Y']:"" + if(a_roadno == b_roadno){ + roadnoConnt.addAndGet(1) + sameCount++ + }else{ + list << "roadno" + } + + def a_community = d['I']?d['I']:"" + def b_community = d['W']?d['W']:"" + if(a_community == b_community){ + communityCount.addAndGet(1) + sameCount++ + }else{ + list << "community" + } + + def a_poi = d['J']?d['J']:"" + def b_poi = d['AA']?d['AA']:"" + if(a_poi == b_poi){ + poiCount.addAndGet(1) + sameCount++ + }else{ + list << "poi" + } + + def a_subpoi = d['K']?d['K']:"" + def b_subpoi = d['AB']?d['AB']:"" + if(a_subpoi == b_subpoi){ + subpoiCount.addAndGet(1) + sameCount++ + }else{ + list << "subpoi" + } + + def a_houseno = d['L']?d['L'].replace("号楼","").replace("幢楼","").replace("栋号","").replace("幢","").replace("栋","").replace("座","").replace("号","").replace("楼","").replace("第","").replace("楼",""):"" + def b_houseno = d['AD']?d['AD'].replace("号楼","").replace("幢楼","").replace("栋号","").replace("幢","").replace("栋","").replace("座","").replace("号","").replace("楼","").replace("第","").replace("楼",""):"" + if(a_houseno == b_houseno){ + housenoCount.addAndGet(1) + sameCount++ + }else{ + list << "houseno" + } + + def a_cellno = d['M']?chNumberConver(d['M'].replace("单元","")):"" + def b_cellno = d['AE']?chNumberConver(d['AE'].replace("单元","")):"" + if(a_cellno == b_cellno){ + cellnoCount.addAndGet(1) + sameCount++ + }else{ + list << "cellno" + } + + def a_floorno = d['N']?d['N'].replace("层楼","").replace("层","").replace("楼",""):"" + def b_floorno = d['AF']?d['AF'].replace("层楼","").replace("层","").replace("楼",""):"" + if(a_floorno == b_floorno){ + floornoCount.addAndGet(1) + sameCount++ + }else{ + list << "floorno" + } + + def a_roomno = d['O']?d['O'].replace("室号","").replace("号门","").replace("室","").replace("房","").replace("户","").replace("号","").replace("门",""):"" + def b_roomno = d['AG']?d['AG'].replace("室号","").replace("号门","").replace("室","").replace("房","").replace("户","").replace("号","").replace("门",""):"" + if(a_roomno == b_roomno){ + roomnoCount.addAndGet(1) + sameCount++ + }else{ + list << "roomno" + } + + def a_dev = d['Q']?d['Q']:'' + def b_dev = d['AH']?d['AH']:'' + if(a_dev == b_dev){ + devCount.addAndGet(1) + sameCount++ + }else{ + list << "dev" + } + + d['AI'] = sameCount + d['AJ'] = list.join(",") + + },0) + + def totalCount = total.get() + println totalCount + def prov_pre = DataHandleUtils.getDoubleRound(2, provCount.get()*100.0/totalCount) + def city_pre = DataHandleUtils.getDoubleRound(2, cityCount.get()*100.0/totalCount) + def dist_pre = DataHandleUtils.getDoubleRound(2, distCount.get()*100.0/totalCount) + def town_pre = DataHandleUtils.getDoubleRound(2, townCount.get()*100.0/totalCount) + def community_pre = DataHandleUtils.getDoubleRound(2, communityCount.get()*100.0/totalCount) + def road_pre = DataHandleUtils.getDoubleRound(2, roadCount.get()*100.0/totalCount) + def roadno_pre = DataHandleUtils.getDoubleRound(2, roadnoConnt.get()*100.0/totalCount) + def poi_pre = DataHandleUtils.getDoubleRound(2, poiCount.get()*100.0/totalCount) + def subpoi_pre = DataHandleUtils.getDoubleRound(2, subpoiCount.get()*100.0/totalCount) + def houseno_pre = DataHandleUtils.getDoubleRound(2, housenoCount.get()*100.0/totalCount) + def cellno_pre = DataHandleUtils.getDoubleRound(2, cellnoCount.get()*100.0/totalCount) + def floor_pre = DataHandleUtils.getDoubleRound(2, floornoCount.get()*100.0/totalCount) + def roomno_pre = DataHandleUtils.getDoubleRound(2, roomnoCount.get()*100.0/totalCount) + def datas = [] + datas << ["总量", "prov","city","dist","town","community","road","roadno","poi","subpoi","houseno","cellno","floor","roomno"] + datas << [totalCount,prov_pre,city_pre,dist_pre,town_pre,community_pre,road_pre,roadno_pre,poi_pre,subpoi_pre,houseno_pre,cellno_pre,floor_pre,roomno_pre] + ExcelUtils.write("d://数据//地址标准化//测试结果1.xlsx", datas, "数据") + + } + + def chNumberConver(def s){ + if(s && s.size()==1){ + return s.replace("一","1").replace("二","2").replace("三","3").replace("四","4").replace("五","5").replace("六","6").replace("七","7").replace("八","8").replace("九","9").replace("十","10") + } + return s; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy index b26bd079b..d436aa081 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/CrawlDistrictIdSelect.groovy @@ -15,8 +15,8 @@ class CrawlDistrictIdSelect { static main(args) { def task = new CrawlDistrictIdSelect() -// task.run() - task.synch() + task.run() +// task.synch() } def synch(){ @@ -38,25 +38,34 @@ class CrawlDistrictIdSelect { def run(){ def datas = findCrawlData() + def list = [] datas.each {k,v-> if(v){ for(def d : v){ d.c_date = new Date() d.m_date = new Date() - districtseedsColl.save(d) + list << d } } + + if(list.size()==10000){ + districtseedsColl.insert(list) + list = [] + } + } + if(list.size()>0){ + districtseedsColl.insert(list) } } def findCrawlData(){ def q = new BasicDBObject() // q.put("city","福州") - q.put("source", "诸葛找房") - q.put("s_date",202010) + q.put("source", "安居客") + q.put("s_date",202012) def dbcursor = thirdPartyColl.find(q).batchSize(10000).setOptions(Bytes.QUERYOPTION_NOTIMEOUT) def retMap = [:] - def prefix = "xiaoqu.zhuge.com/" + def prefix = "anjuke.com/" def keyList =new HashSet() for(def db : dbcursor){ def url = null @@ -68,11 +77,11 @@ class CrawlDistrictIdSelect { url = db.url } if(url && url.contains(prefix) ){ - def district_id = url.substring(url.indexOf(prefix)+prefix.length(),url.size()-1) + def district_id = db.district_id//url.substring(url.indexOf(prefix)+prefix.length(),url.size()-1) if(district_id=="0"){ continue } - def shortCity = url.substring(url.indexOf("//")+2, url.indexOf(".xiaoqu.zhuge.com")) + def shortCity = url.substring(url.indexOf("//")+2, url.indexOf(".anjuke.com")) def key = shortCity +"#"+district_id def ids = retMap.get(key) @@ -83,7 +92,7 @@ class CrawlDistrictIdSelect { if(!keyList.contains(key)){ def map = new BasicDBObject() - map.root = "zhuge.com" + map.root = "anjuke.com" map.city_short= shortCity map.city = db.city map.region = db.region diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy index b43b98223..93370a4a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy @@ -4,14 +4,17 @@ import com.fangjia.script.util.CommonUtils import com.mongodb.BasicDBObject import org.apache.solr.common.util.Hash +/** + * 福州农商行 + * 将抓取的小区均价同步到第三方均价表中 + */ class SynchDistrictPrice { def static final SHORT_DATE = Utils.getLastMonth() def thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); def districtDetailColl = CrawalDBUtil.getDistrictDetailColl(); - def sourceMap = ["jiwu.com":"吉屋"] - //"58.com":"58同城","lianjia.com":"链家","ke.com":"贝壳找房","fang.com":"搜房","fangdd.com":"房多多","jiwu.com":"吉屋" - + def sourceMap = ["jiwu.com":"吉屋","58.com":"58同城","lianjia.com":"链家","ke.com":"贝壳找房","fang.com":"搜房","fangdd.com":"房多多","house365.com":"365淘房", + "anjuke.com":"安居客"] static main(args) { def task = new SynchDistrictPrice() task.run() @@ -19,13 +22,14 @@ class SynchDistrictPrice { def run(){ - def citys = ["福州"]//CommonUtils.findAllCity() + def citys = CommonUtils.findAllCity() sourceMap.each { k, v -> for(def city : citys){ def rets = findCrawlDistrictDetails(city, k, v) - synchData(city, rets, v) println city +" "+rets.size() + synchData(city, rets, v) + } } @@ -76,7 +80,7 @@ class SynchDistrictPrice { }catch(Exception e){ println e.getMessage() } - + println "["+source +"-"+city + "] add:"+ rets.size()+" 原抓取:"+count }else{ for(def r : rets){ def flag = findIsExists(r.city, r.region, r.name, SHORT_DATE, source) @@ -85,9 +89,10 @@ class SynchDistrictPrice { thirdPartyColl.save(r) } } + println "["+source +"-"+city + "] add:"+ addIndex+" 原抓取:"+count } - println "["+source +"-"+city + "] add:"+ addIndex+" 原抓取:"+count + } def findIsExists(def city, def region, def name, def sDate, def source){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy index 15910f5cb..24b482d1e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy @@ -14,8 +14,8 @@ class TestCrawlTotalCount { def run(){ def sources = ["房估估","诸葛找房","安居客","搜房","中原地产","赶集","链家","兔博士","城市房产","贝壳找房","Q房","Q房(新)","中原地产(新)","乐有家","乐有家(新)","房探","房多多","小资家","我爱我家","麦田","房途","C21","乐居","房产超市","58同城","365淘房"] for(def source :sources){ - def count1 = findTotalCount(source, 202102); - def count2 = findTotalCount(source, 202103); + def count1 = findTotalCount(source, 202105); + def count2 = findTotalCount(source, 202106); println source +" "+count1 +" "+count2 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy index 4cad85c53..1cf782236 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.util +import com.fangjia.script.lixue.util.DateFormat import org.apache.commons.lang.StringUtils import org.apache.poi.hssf.record.BoolErrRecord @@ -389,8 +390,8 @@ public class ExcelUtils{ try{ closure.call(row) int count = counter.incrementAndGet() - if(count % 100 == 0){ - println("执行进度:${com.fangjia.core.util.DataUtil.roundDouble((count * 100)/total, 2)}%") + if(count % 1000 == 0){ + println(DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd HH:mm:ss")+"执行进度:${com.fangjia.core.util.DataUtil.roundDouble((count * 100)/total, 2)}%") } }catch (Exception e){ println(row) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy index a23842026..6e5696107 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy @@ -121,9 +121,9 @@ public class OpenApiClient { params.put("suggestName", suggestName) } - String content = new HttpRequest().get("http://open.fangjia.com/address/match", params, "utf-8") + String content = new HttpRequest().get("http://open.fangjia.com/address/matchV2", params, "utf-8") while (content == null) { - content = new HttpRequest().get("http:///open.fangjia.com/address/match", params, "utf-8") + content = new HttpRequest().get("http:///open.fangjia.com/address/matchV2", params, "utf-8") println("${city} ${input} ${cat}程序调用异常") Thread.sleep(6000) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy index ad4b4f415..781687012 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy @@ -173,6 +173,41 @@ class GaoDeApiUtils { } + def static around2(String location,String radius, String keywords = null, types = null) { + Map params = new HashMap() + params.put("key", GAO_DE_AK) + if(keywords){ + params.put("keywords", keywords) + } + if(types){ + params.put("types", types) + } + if(location){ + params.put("location", location) + } + if(radius){ + params.put("radius", radius) + } + params.put("sortrule", "distance") + String content = null; + try { + content = new HttpRequest().newGet("https://restapi.amap.com/v3/place/around", params, "utf-8") + } catch (Exception e) { + return null; + } + JSONObject jsonObj = JSONObject.fromObject(content) + if(jsonObj && jsonObj.get("infocode").equals("10000")){ + return jsonObj + }else if(jsonObj && jsonObj.get("infocode").equals("20003")){ + return null; + } else { + return around(location, radius, keywords, types) + } + return null; + } + + + def static searchKey(def keyword, def cityCode){ def url = "https://www.amap.com/service/poiInfo?query_type=TQUERY&pagesize=20&pagenum=1&qii=true&cluster_state=5&need_utd=true&utd_sceneid=1000&div=PC1000&addr_poi_merge=true&is_classify=true&zoom=10&city="+cityCode+"&geoobj=113.082026%7C22.516777%7C115.059608%7C22.922141&keywords="+URLEncoder.encode(keyword,"UTF-8") String content From 1cc1a56e13bba93776ea8d297e850cf122f57e06 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 7 Jul 2021 17:53:20 +0800 Subject: [PATCH 13/25] =?UTF-8?q?http=20=E6=94=B9https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-open/src/main/webapp/coming.ftl | 2 +- .../src/main/webapp/district/districtDetail.ftl | 6 +++--- .../fangjia-open/src/main/webapp/district/weXinList.ftl | 4 ++-- .../fangjia-open/src/main/webapp/district/wrongPrice.ftl | 6 +++--- projects/fangjia-open/src/main/webapp/map.html | 6 +++--- projects/fangjia-open/src/main/webapp/user/about.ftl | 6 +++--- .../fangjia-open/src/main/webapp/user/productAndService.ftl | 6 +++--- .../fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl | 2 +- .../fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl | 2 +- projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl | 6 +++--- projects/fangjia-open/src/main/webapp/user/showData.ftl | 2 +- .../src/main/webapp/weiXinEvaluation/collects.ftl | 2 +- .../fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl | 2 +- .../fangjia-open/src/main/webapp/weiXinEvaluation/input.ftl | 2 +- .../src/main/webapp/weiXinEvaluation/recordList.ftl | 2 +- .../src/main/webapp/weiXinEvaluation/report.ftl | 4 ++-- .../src/main/webapp/weiXinEvaluation/result.ftl | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/projects/fangjia-open/src/main/webapp/coming.ftl b/projects/fangjia-open/src/main/webapp/coming.ftl index e6d3ac638..1f0e17e78 100644 --- a/projects/fangjia-open/src/main/webapp/coming.ftl +++ b/projects/fangjia-open/src/main/webapp/coming.ftl @@ -12,7 +12,7 @@ - + diff --git a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl index a2cc33001..df44569db 100644 --- a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl +++ b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl @@ -12,7 +12,7 @@ - + @@ -117,10 +117,10 @@ <#include '/layout/footer.ftl'/> - + - + <#if !(cityName??) || cityName ==''> - + - + + diff --git a/projects/fangjia-open/src/main/webapp/map.html b/projects/fangjia-open/src/main/webapp/map.html index a0b3eb2b0..62513fc48 100644 --- a/projects/fangjia-open/src/main/webapp/map.html +++ b/projects/fangjia-open/src/main/webapp/map.html @@ -21,9 +21,9 @@ float: left; } - - - + + + diff --git a/projects/fangjia-open/src/main/webapp/user/about.ftl b/projects/fangjia-open/src/main/webapp/user/about.ftl index 114968a6b..a085c96ac 100644 --- a/projects/fangjia-open/src/main/webapp/user/about.ftl +++ b/projects/fangjia-open/src/main/webapp/user/about.ftl @@ -12,7 +12,7 @@ - + @@ -56,8 +56,8 @@ - - + + diff --git a/projects/fangjia-open/src/main/webapp/user/productAndService.ftl b/projects/fangjia-open/src/main/webapp/user/productAndService.ftl index 8b925e447..70463a027 100644 --- a/projects/fangjia-open/src/main/webapp/user/productAndService.ftl +++ b/projects/fangjia-open/src/main/webapp/user/productAndService.ftl @@ -13,7 +13,7 @@ - + @@ -189,8 +189,8 @@ - - + + diff --git a/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl b/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl index 9b364067b..e9650d653 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl @@ -11,7 +11,7 @@ - + diff --git a/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl b/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl index 1b6a4a0ac..5575699f0 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqCityChoicePage.ftl @@ -13,7 +13,7 @@ - + - + + - + + From f0617d0c8c052d7d495cbc2b253ec09f70013555 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 7 Jul 2021 17:45:03 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E6=96=87=E4=BB=B6utf-8=E8=BD=ACGBK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/fuzhou/Test1.groovy | 2 +- .../script/gj/district/ZsPersonProcess.groovy | 99 +++++++++++++- .../script/zsbank/BasicInfoDataSynch.groovy | 122 +++++++++--------- 3 files changed, 157 insertions(+), 66 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy index 4e1922326..0a1582501 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection //福州第三方均价统计,发送钉钉消息 //def datas = ExcelUtils.read("d:\\数据\\福州\\福州4月2.xlsx",0,1) //def datas = CsvUtils.read("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv"); -def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv") +def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202106.csv") def count0 = 0 def count1 = 0 def count2 = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy index abb8e3ae9..e760b169f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ZsPersonProcess.groovy @@ -55,7 +55,9 @@ class ZsPersonProcess { // task.matchDb2() // task.matchDb3() - task.saveOrUpdate() +// task.saveOrUpdate() +// task.addAlias() + task.updateLocation() } def matchMap(){ @@ -1048,8 +1050,8 @@ class ZsPersonProcess { obj = CommonDatautils.findDistrictByAlias(row[0], row[1], row[2], "district") } if(!obj){ - //saveData(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9]) - //FangjiaClientUtils.sendDistrictPriceCalculate(row[0], row[1], row[2], 4); + saveData(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9]) + FangjiaClientUtils.sendDistrictPriceCalculate(row[0], row[1], row[2], 4); println "【新增】 ${row[0]} ${row[1]} ${row[2]}" }else{ println "【已存在】 ${row[0]} ${row[1]} ${row[2]}" @@ -1064,6 +1066,95 @@ class ZsPersonProcess { } + def updateLocation(){ + def keys = [] + ExcelUtils.modify("d:\\数据\\浙商\\测试.xlsx", { d -> + if (d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger() == 6) { + if (d['AQ'] && d['AQ'].contains("已存在[距离远]")) { + if (d['U'] && d['Z'] && d['AA']) { + def obj = findData(d['AL'], d['AM'], d['AN']) + if(obj){ + def lat2 = null + def lng2 = null + def lat = null + def lng = null + if(d['Y']=="高德"){ + lng = (d['AC'].toDouble()*10000000000).longValue() + lat = (d['AD'].toDouble()*10000000000).longValue() + def gmap = GeocodeUtils.getGaodeToBaidu(d['AC'].toDouble(), d['AD'].toDouble()) + if(gmap){ + lng2 = (gmap.get("lng")*10000000000).longValue() + lat2 = (gmap.get("lat")*10000000000).longValue() + } + }else if(d['Y']=="百度"){ + lng2 = (d['AC'].toDouble()*10000000000).longValue() + lat2 = (d['AD'].toDouble()*10000000000).longValue() + def gmap = GeocodeUtils.geoconvBaiduToGoogle(d['AC'].toDouble(), d['AD'].toDouble()) + if(gmap){ + lng = (gmap.get("lng")*10000000000).longValue() + lat = (gmap.get("lat")*10000000000).longValue() + } + } + + def key = d['AL']+"##"+d['AM']+"##"+d['AN'] + if(!keys.contains(key)){ + keys << key + def q = new BasicDBObject() + q.put("_id", obj._id) + + def udata = new BasicDBObject() + udata.put("lng", lng) + udata.put("lat", lat) + udata.put("lng2", lng2) + udata.put("lat2", lat2) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + } + + } + } + } + } + },0) + } + + def addAlias(){ + ExcelUtils.modify("d:\\数据\\浙商\\测试.xlsx", { d -> + if (d['Y'] && d['S'] && d['S'].toString().toDouble().toInteger() == 6) { + if (d['AQ'] && d['AQ'].contains("别名") && !d['AQ'].contains("分期")) { + if (d['U'] && d['Z'] && d['AA']) { + def obj = findData(d['AL'], d['AM'], d['AN']) + if(obj){ + def aliasName = d['AA'].replace("(建设中)","") + if(d['AN']!=aliasName){ + def alias = obj.alias + + def q = new BasicDBObject() + q.put("_id", obj._id) + + if(!alias){ + alias = [] + } + + if(!alias.contains(aliasName)){ + alias << aliasName + def udata = new BasicDBObject() + + udata.put("alias", alias) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + println d['AN'] +" "+d['AA'] + } + + } + } + + } + } + } + },0) + } + def findData(city, region, newName){ def q = new BasicDBObject() q.put("city", city) @@ -1074,7 +1165,7 @@ class ZsPersonProcess { return DbUtils.seaweed.findOne(q) } - def saveData(city, region, newName, newAddress, estateType, lng2, lat2, lng, lat, alias){ + def saveData(city, region, newName, newAddress, estateType, lng, lat, lng2, lat2, alias){ def d = new BasicDBObject() d.put("city", city) d.put("region", region) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy index 4cdcf5656..58655f17f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/zsbank/BasicInfoDataSynch.groovy @@ -12,7 +12,7 @@ import com.mongodb.DBObject import com.mongodb.QueryOperators /** - * 娴欏晢鏈湴鍖栭儴缃插悓姝ヨ剼鏈� + * 浙商本地化部署同步脚本 */ @BatchOwner(Watcher.GaoJuan) class BasicInfoDataSynch extends BaseBatch{ @@ -52,14 +52,14 @@ class BasicInfoDataSynch extends BaseBatch{ zsCitysMap.put(zsCitys._id.toString(), zsCitys) zsDatas << zsCitys } - //鏁版嵁瀛樺湪鍒欎慨鏀癸紝涓嶅瓨鍦ㄥ垯淇濆瓨 + //数据存在则修改,不存在则保存 if(fangjiaCitys){ for(def fjCity : fangjiaCitys){ - if(fjCity.display!="鍏ㄥ浗"){ + if(fjCity.display!="全国"){ fjCitysMap.put(fjCity._id.toString(), fjCity) } def zsCity = zsCitysMap.get(fjCity._id.toString()) - if(zsCity){//淇敼 + if(zsCity){//修改 if(zsCity.province != fjCity.province || zsCity.alias!=fjCity.alias){ def udata = new BasicDBObject() udata.put("province",fjCity.province) @@ -68,7 +68,7 @@ class BasicInfoDataSynch extends BaseBatch{ udata.put("update_date",new Date().getTime()) ZS_CITYS_CONN.update(new BasicDBObject("_id",zsCity._id), new BasicDBObject('$set',udata)) } - }else{//淇濆瓨 + }else{//保存 def addUata = new BasicDBObject() addUata.put("_id",fjCity._id) addUata.put("display",fjCity.display) @@ -81,7 +81,7 @@ class BasicInfoDataSynch extends BaseBatch{ } } - //鑰佹暟鎹笉鍦ㄦ柊鏁版嵁涓紝琚垹闄ゆ椂锛岀姸鎬佷慨鏀逛负1 + //老数据不在新数据中,被删除时,状态修改为1 if(zsDatas){ for(def zsCity : zsDatas){ def fjCity = fjCitysMap.get(zsCity._id.toString()) @@ -94,7 +94,7 @@ class BasicInfoDataSynch extends BaseBatch{ } } - println "[${fangjiaCitys.size()}]涓煄甯傚悓姝ュ畬鎴�" + println "[${fangjiaCitys.size()}]个城市同步完成" } def synchRegion(){ @@ -139,7 +139,7 @@ class BasicInfoDataSynch extends BaseBatch{ } } } - println "[${fjRegions.size()}]涓鏀垮尯鍩熷悓姝ュ畬鎴�" + println "[${fjRegions.size()}]个行政区域同步完成" } def synchTown(){ @@ -185,7 +185,7 @@ class BasicInfoDataSynch extends BaseBatch{ } } } - println "[${fjTowns.size()}]涓埂闀囧悓姝ュ畬鎴�" + println "[${fjTowns.size()}]个乡镇同步完成" } def synchDict(){ def dbcursor = ZS_DICT_CONN.find(new BasicDBObject()).sort(new BasicDBObject("version",-1)).limit(1) @@ -238,57 +238,57 @@ class BasicInfoDataSynch extends BaseBatch{ - /* def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject()) - def zsDicts = [] - def zsDictMap = [:] - def fjDictMap = [:] - for(def obj : zsDictCursor){ - zsDictMap.put(obj._id.toString(), obj) - zsDicts << obj; - } - if(fjDicts){ - def addDatas = [] - for(def fjDict : fjDicts){ - fjDictMap.put(fjDict._id.toString(), fjDict) - def zsDictObj = zsDictMap.get(fjDict._id.toString()) - def udata = new BasicDBObject() - udata.put("cat",fjDict.cat) - udata.put("name",fjDict.name) - udata.put("status",0) - udata.put("update_date",new Date().getTime()) - udata.put("version", version) - if(zsDictObj){ - if(fjDict.cat!=zsDictObj.cat||fjDict.name!=zsDictObj.name||zsDictObj.status!=0){ - ZS_DICT_CONN.update(new BasicDBObject("_id",zsDictObj._id), new BasicDBObject('$set',udata)) - } - }else{ - udata.put("_id",fjDict._id) - addDatas << udata - if(addDatas.size()%10000==0){ - println addDatas.size()/10000 +" 10000" - ZS_DICT_CONN.insert(addDatas); - addDatas = []; - } - } - } - if(addDatas.size()>0){ - ZS_DICT_CONN.insert(addDatas); - addDatas = []; - } - } + /* def zsDictCursor = ZS_DICT_CONN.find(new BasicDBObject()) + def zsDicts = [] + def zsDictMap = [:] + def fjDictMap = [:] + for(def obj : zsDictCursor){ + zsDictMap.put(obj._id.toString(), obj) + zsDicts << obj; + } + if(fjDicts){ + def addDatas = [] + for(def fjDict : fjDicts){ + fjDictMap.put(fjDict._id.toString(), fjDict) + def zsDictObj = zsDictMap.get(fjDict._id.toString()) + def udata = new BasicDBObject() + udata.put("cat",fjDict.cat) + udata.put("name",fjDict.name) + udata.put("status",0) + udata.put("update_date",new Date().getTime()) + udata.put("version", version) + if(zsDictObj){ + if(fjDict.cat!=zsDictObj.cat||fjDict.name!=zsDictObj.name||zsDictObj.status!=0){ + ZS_DICT_CONN.update(new BasicDBObject("_id",zsDictObj._id), new BasicDBObject('$set',udata)) + } + }else{ + udata.put("_id",fjDict._id) + addDatas << udata + if(addDatas.size()%10000==0){ + println addDatas.size()/10000 +" 10000" + ZS_DICT_CONN.insert(addDatas); + addDatas = []; + } + } + } + if(addDatas.size()>0){ + ZS_DICT_CONN.insert(addDatas); + addDatas = []; + } + } - if(zsDicts){ - for(def zsDict : zsDicts){ - def fjDict = fjDictMap.get(zsDict._id.toString()) - if(!fjDict){ - def udata = new BasicDBObject() - udata.put("status",1) - udata.put("update_date",new Date().getTime()) - ZS_DICT_CONN.update(new BasicDBObject("_id",zsDict._id), new BasicDBObject('$set',udata)) - } - } - }*/ - println "[${fjDicts.size()}]涓瓧鍏告暟鎹悓姝ュ畬鎴�" + if(zsDicts){ + for(def zsDict : zsDicts){ + def fjDict = fjDictMap.get(zsDict._id.toString()) + if(!fjDict){ + def udata = new BasicDBObject() + udata.put("status",1) + udata.put("update_date",new Date().getTime()) + ZS_DICT_CONN.update(new BasicDBObject("_id",zsDict._id), new BasicDBObject('$set',udata)) + } + } + }*/ + println "[${fjDicts.size()}]个字典数据同步完成" } def synchDistrict(cat){ def fangjiaCitys = CommonDatautils.findAllCity() @@ -367,10 +367,10 @@ class BasicInfoDataSynch extends BaseBatch{ def udata = new BasicDBObject() udata.put("status",1) udata.put("update_date",new Date().getTime()) - ZS_SEAWEED_CONN.update(new BasicDBObject("_id",fjDistrict._id), new BasicDBObject('$set',udata)) + ZS_SEAWEED_CONN.update(new BasicDBObject("_id",zsDistrict._id), new BasicDBObject('$set',udata)) } } } - println "[${fjCity}-${cat}][${districts.size()}]涓皬鍖烘暟鎹悓姝ュ畬鎴�" + println "[${fjCity}-${cat}][${districts.size()}]个小区数据同步完成" } } From 1824bdb02a819509ba3e281e69e7eba95f4bdb75 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 8 Jul 2021 16:16:39 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8Fcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/UserController.java | 17 ++++++++++ .../fangjia/open/model/weixin/UserModel.java | 19 +++++++++++ .../src/main/webapp/user/reqLoginPage.ftl | 3 +- .../service/open/WeChatAuthService.java | 3 ++ .../service/open/WeChatAuthServiceImpl.java | 34 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 852a595ad..f8884877d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -217,6 +217,23 @@ public class UserController { String username = StringUtils.trimToNull(model.getUsername()); String pass = StringUtils.trimToNull(model.getPass()); String weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + + if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ + System.out.println("小程序code:"+model.getCode()); + WeChatAuthServiceImpl.WeChatWebToken token = weChatAuthService.getWeChatWebToken(model.getCode(), model.getAppId(), model.getAppSecret()); + if(token != null) { + weiXinId = token.getOpenid(); + } else { + weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + } + if(weiXinId == null) { + weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + } + if(weiXinId != null && !weiXinId.equals("")){ + CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); + } + System.out.println("小程序微信OPEN_ID:" + weiXinId); + } //测试时可以先去掉 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java index 7a9289588..8255c2800 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java @@ -16,6 +16,9 @@ public class UserModel extends BaseModel { private String pass; private String code; private List citys; + + private String appId;//测试 + private String appSecret;//测试 public List getCitys() { return citys; @@ -80,4 +83,20 @@ public class UserModel extends BaseModel { public void setCode(String code) { this.code = code; } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAppSecret() { + return appSecret; + } + + public void setAppSecret(String appSecret) { + this.appSecret = appSecret; + } } diff --git a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl index 621633126..536a5e44c 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl @@ -77,7 +77,8 @@ url : "../user/enterpriseLogin", data : { "username" : username, - "pass":pass + "pass":pass, + "code":"${code!''}" }, success : function(result) { var re = $.parseJSON(result); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthService.java index 07483c151..d28e76db8 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthService.java @@ -24,4 +24,7 @@ public interface WeChatAuthService { */ WeChatAuthServiceImpl.WeChatWebToken getWeChatWebToken(String code); + + WeChatAuthServiceImpl.WeChatWebToken getWeChatWebToken(String code, String appId, String appSecret); + } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthServiceImpl.java index 43f0bb0e3..4e233055a 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/WeChatAuthServiceImpl.java @@ -108,6 +108,40 @@ public class WeChatAuthServiceImpl implements WeChatAuthService{ } + public WeChatWebToken getWeChatWebToken(String code, String appId, String appSecret){ + + if(code == null){ + return null; + } + HttpRequest request = new HttpRequest(); + Map params = new HashMap(); + params.put("appid", appId); + params.put("grant_type", "authorization_code"); + params.put("secret", appSecret); + params.put("code", code); + try { + JSONObject json = request.getJsonContent(WE_CHAT_API_HOST + "/sns/oauth2/access_token",params ,"UTF-8"); + if(json.containsKey("access_token")){ + WeChatWebToken token = new WeChatWebToken(); + token.accessToken = json.getString("access_token"); + token.expiresIn = json.getInt("expires_in"); + token.refreshToken= json.getString("refresh_token"); + token.openid = json.getString("openid"); + token.scope = json.getString("scope"); + return token; + }else{ + logger.error("Web Access Token 获取失败:" + json.toString()); + } + + } catch (HttpRequestException e) { + logger.error("Web Access Token 获取失败:", e); + } + + return null; + } + + + public static class WeChatToken implements Serializable{ From 10ce9783248b63bbd5bbaeb89912e21ec0c1486b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 8 Jul 2021 17:32:05 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/UserController.java | 54 ++++++++++++++++++- .../controllers/xcx/XcxInfoController.java | 2 + .../fangjia/open/model/weixin/UserModel.java | 9 ++++ .../src/main/webapp/user/reqLoginPage.ftl | 5 +- .../mongo/fangjia/XcxUserInfoService.java | 2 + .../mongo/fangjia/XcxUserInfoServiceImpl.java | 33 ++++++++++++ 6 files changed, 103 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index f8884877d..64077edde 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -10,6 +10,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.fangjia.dal.common.XcxKey; +import com.fangjia.dal.mongo.model.bkoff.XcxUserInfo; +import com.fangjia.service.mongo.fangjia.XcxUserInfoService; import com.fangjia.service.open.WeChatAuthService; import com.fangjia.service.open.WeChatAuthServiceImpl; import com.fangjia.service.util.CookieUtils; @@ -37,6 +40,7 @@ public class UserController { private UserCityService userCityService; private FjtUsersService fjtUsersService; private WeChatAuthService weChatAuthService; + private XcxUserInfoService xcxUserInfoService; public void setUserCityService(UserCityService userCityService) { this.userCityService = userCityService; @@ -58,7 +62,11 @@ public class UserController { public Object reqLoginPageAction(UserModel model) { return model; } - + + public void setXcxUserInfoService(XcxUserInfoService xcxUserInfoService) { + this.xcxUserInfoService = xcxUserInfoService; + } + public Object reqCityChoicePageAction(UserModel model, HttpServletResponse response, HttpServletRequest request) { String type = StringUtils.trimToNull(model.getType()); if(!StringUtils.isBlank(type)){ @@ -220,6 +228,8 @@ public class UserController { if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ System.out.println("小程序code:"+model.getCode()); + System.out.println("小程序AppId:"+model.getAppId()); + System.out.println("小程序AppSecret:"+model.getAppSecret()); WeChatAuthServiceImpl.WeChatWebToken token = weChatAuthService.getWeChatWebToken(model.getCode(), model.getAppId(), model.getAppSecret()); if(token != null) { weiXinId = token.getOpenid(); @@ -234,6 +244,24 @@ public class UserController { } System.out.println("小程序微信OPEN_ID:" + weiXinId); } + + if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getSid())){ + System.out.println("小程序code:"+model.getCode()); + System.out.println("小程序AppId:"+model.getAppId()); + System.out.println("小程序AppSecret:"+model.getAppSecret()); + System.out.println("sid:"+model.getSid()); + XcxKey sessionValue = getSessionValue(model.getCode(), null, model.getAppId(), model.getAppSecret()); + if(sessionValue!=null){ + weiXinId = sessionValue.getOpenId(); + } + if(weiXinId == null) { + weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + } + if(weiXinId != null && !weiXinId.equals("")){ + CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); + } + System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); + } //测试时可以先去掉 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); @@ -258,6 +286,30 @@ public class UserController { return resultModel; } } + + + public XcxKey getSessionValue(String code, String sid, String appId, String secret){ + XcxKey sessionValue = null; + if(StringUtils.isNotBlank(sid)){ + System.out.println(sid+"houqi"); + sessionValue = new XcxKey(); + sessionValue.setSid(sid); + sessionValue.setOpenId(sid); + } + //缓存中没有登陆信息 + if(sessionValue==null){ + //获取openid信息 + sessionValue = xcxUserInfoService.getOpenId(code, appId, secret); + XcxUserInfo user = null; + if(sessionValue!=null&&StringUtils.isNotBlank(sessionValue.getOpenId())){ + //根据是否是第一次使用,保存并查询除用户信息 + user = xcxUserInfoService.save(sessionValue.getOpenId(), null); + sessionValue.setSid(sessionValue.getOpenId()); + } + + } + return sessionValue; + } /** * 获取缓存的验证码 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java index 7553d1678..4d3772584 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java @@ -191,6 +191,8 @@ public class XcxInfoController { } return sessionValue; } + + /** * 小程序估价接口 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java index 8255c2800..1db056696 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java @@ -19,6 +19,7 @@ public class UserModel extends BaseModel { private String appId;//测试 private String appSecret;//测试 + private String sid;//测试 public List getCitys() { return citys; @@ -99,4 +100,12 @@ public class UserModel extends BaseModel { public void setAppSecret(String appSecret) { this.appSecret = appSecret; } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } } diff --git a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl index 536a5e44c..ce65f946a 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl @@ -78,7 +78,10 @@ data : { "username" : username, "pass":pass, - "code":"${code!''}" + "code":"${code!''}", + "sid":"${sid!''}", + "appId":"${appId!''}", + "appSecret":"${appSecret!''}" }, success : function(result) { var re = $.parseJSON(result); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java index cb575be0a..f4c2041b8 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java @@ -34,6 +34,8 @@ public interface XcxUserInfoService { * @return */ public XcxKey getOpenId(String code); + + public XcxKey getOpenId(String code, String appId, String secret); /** * 获取有多少人查询过他们自己的故事 * @return diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java index 57b4bc854..572703130 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java @@ -101,6 +101,39 @@ public class XcxUserInfoServiceImpl implements XcxUserInfoService { return null; } + + @Override + public XcxKey getOpenId(String code, String appId, String secret) { + HttpRequest http = new HttpRequest(); + //获取openid + HashMap map = new HashMap(); + map.put("appid", appId); + map.put("secret", secret); + map.put("grant_type", XCXConstant.GRANT_TYPE); + map.put("js_code", code); + String result = null; + try { + result = http.get(XCXConstant.OPENID_URL, map, "utf-8"); + System.out.println(result); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + //解析result + if(StringUtils.isNotBlank(result)){ + JSONObject json = JSONObject.fromObject(result); + if(json!=null&&json.get("openid")!=null){ + String openId = (json.get("openid")!=null)?json.get("openid").toString():null; + String sessionKey = (json.get("session_key")!=null)?json.get("session_key").toString():null; + XcxKey xcxKey = new XcxKey(); + xcxKey.setOpenId(openId); + xcxKey.setSessionKey(sessionKey); + return xcxKey; + } + + } + return null; + } + @Override public int havaReviewStory() { From f45fa30385b95d4d566a58e7f3553ba795d6ce42 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 8 Jul 2021 17:50:04 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/UserController.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 64077edde..772a38d2e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -226,6 +226,24 @@ public class UserController { String pass = StringUtils.trimToNull(model.getPass()); String weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getSid())){ + System.out.println("小程序code:"+model.getCode()); + System.out.println("小程序AppId:"+model.getAppId()); + System.out.println("小程序AppSecret:"+model.getAppSecret()); + System.out.println("sid:"+model.getSid()); + XcxKey sessionValue = getSessionValue(model.getCode(), null, model.getAppId(), model.getAppSecret()); + if(sessionValue!=null){ + weiXinId = sessionValue.getOpenId(); + } + if(weiXinId == null) { + weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + } + if(weiXinId != null && !weiXinId.equals("")){ + CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); + } + System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); + } + if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ System.out.println("小程序code:"+model.getCode()); System.out.println("小程序AppId:"+model.getAppId()); @@ -244,24 +262,6 @@ public class UserController { } System.out.println("小程序微信OPEN_ID:" + weiXinId); } - - if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getSid())){ - System.out.println("小程序code:"+model.getCode()); - System.out.println("小程序AppId:"+model.getAppId()); - System.out.println("小程序AppSecret:"+model.getAppSecret()); - System.out.println("sid:"+model.getSid()); - XcxKey sessionValue = getSessionValue(model.getCode(), null, model.getAppId(), model.getAppSecret()); - if(sessionValue!=null){ - weiXinId = sessionValue.getOpenId(); - } - if(weiXinId == null) { - weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); - } - if(weiXinId != null && !weiXinId.equals("")){ - CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); - } - System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); - } //测试时可以先去掉 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); From 7db8294c380557c9673096495efb9373ef02c03c Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 9 Jul 2021 11:08:47 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B8=A4=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/UserController.java | 44 ++++---- .../main/webapp/static/images/bohaiyidai2.jpg | Bin 0 -> 36363 bytes .../static/images/xcxImage/bohaiyidai.jpg | Bin 0 -> 17353 bytes .../src/main/webapp/user/bhydLoginPage.ftl | 104 ++++++++++++++++++ .../src/main/webapp/user/reqLoginPage.ftl | 6 +- 5 files changed, 129 insertions(+), 25 deletions(-) create mode 100644 projects/fangjia-open/src/main/webapp/static/images/bohaiyidai2.jpg create mode 100644 projects/fangjia-open/src/main/webapp/static/images/xcxImage/bohaiyidai.jpg create mode 100644 projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 772a38d2e..5a2c986c7 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -63,6 +63,10 @@ public class UserController { return model; } + public Object bhydLoginPageAction(UserModel model) { + return model; + } + public void setXcxUserInfoService(XcxUserInfoService xcxUserInfoService) { this.xcxUserInfoService = xcxUserInfoService; } @@ -226,7 +230,7 @@ public class UserController { String pass = StringUtils.trimToNull(model.getPass()); String weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); - if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getSid())){ + if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ System.out.println("小程序code:"+model.getCode()); System.out.println("小程序AppId:"+model.getAppId()); System.out.println("小程序AppSecret:"+model.getAppSecret()); @@ -243,25 +247,25 @@ public class UserController { } System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); } - - if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ - System.out.println("小程序code:"+model.getCode()); - System.out.println("小程序AppId:"+model.getAppId()); - System.out.println("小程序AppSecret:"+model.getAppSecret()); - WeChatAuthServiceImpl.WeChatWebToken token = weChatAuthService.getWeChatWebToken(model.getCode(), model.getAppId(), model.getAppSecret()); - if(token != null) { - weiXinId = token.getOpenid(); - } else { - weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); - } - if(weiXinId == null) { - weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); - } - if(weiXinId != null && !weiXinId.equals("")){ - CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); - } - System.out.println("小程序微信OPEN_ID:" + weiXinId); - } +// +// if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ +// System.out.println("小程序code:"+model.getCode()); +// System.out.println("小程序AppId:"+model.getAppId()); +// System.out.println("小程序AppSecret:"+model.getAppSecret()); +// WeChatAuthServiceImpl.WeChatWebToken token = weChatAuthService.getWeChatWebToken(model.getCode(), model.getAppId(), model.getAppSecret()); +// if(token != null) { +// weiXinId = token.getOpenid(); +// } else { +// weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); +// } +// if(weiXinId == null) { +// weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); +// } +// if(weiXinId != null && !weiXinId.equals("")){ +// CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); +// } +// System.out.println("小程序微信OPEN_ID:" + weiXinId); +// } //测试时可以先去掉 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); diff --git a/projects/fangjia-open/src/main/webapp/static/images/bohaiyidai2.jpg b/projects/fangjia-open/src/main/webapp/static/images/bohaiyidai2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7d6910f1e801520ddb3f1163f7774b7fd7b48e79 GIT binary patch literal 36363 zcmeFYRZL}3uq}$aYXgnDcH<5kZQNz!t{ZoEcXww4jk~*BT_H;u#Xb8>I;&dJHm z`+dn9$@*9;8L3(|XEJJ5)r?e9_<@QCVjH|@L^uTOx(XQ!5EkjSYPcSXnOXnq{*_D+ zK0Pdygh}Or^T&zzRk!`N9M@W?&6AiPzR*t0?_b%ESKik?@%cOyQH^!~fv3W{XhWm_ z0OHWVe*h~Y^glq2f&3qkCByqqqyd=z6M?}01XTThl3|ShpUnT6`rnwq|B?D%js732 z|Bd=zng3UR{|}St|K{)iHu~Rw_5V=+H}n5%{{HVE)&19{`LFT)f4QhELI1-}`2WLW zd>f2Gg~Tojh`2G(rK=)={Pw9ja_#-Z+IMpo4oMn%I7f=Wn?L**WaKlUXv9zqIQ<@4 z@A&Rc>c2>&vT@5g@$4)-%nAnu`AppWja=mW;gN65v#$_D{>

C9T2g%qzjbol^S_ zZ9L=$9Eooi&`hXS0R7@J5wx+V)aS_p0$w@#(e5tvj`!js{cOH{T`C?e7Q)}Ze)T0e zc}?xV7Iq>Q^I?PS%E!5xZ1LH4vgm#D`xYu1$Y7JdLUy{6e`I^(7y85*r%V#;LwtHL z=$t=V85bCjS{whknaSDji5RN8l6B$veQX81B8%&bj;}LDM0KAFkjgCs^l2VFJiPe2 z3^l8vj=Bx;9#ob$b;;E*qUW<4&;ifvVFs;*Z}b}TKgen}>-yeMuiJ$|d8DX9AHK~h zd)QF{ip0g6_%b(R*XgOLiPQ-OFlhH;krB>F_po0K`>{;-CZII*58lZ>1=T9@!k@Ym zb`s-#5F`4AhcE8$L&qOAd2q-J9Bwdrm8*J?1E)w4UI~PzsD%4jJ7Ae$3Ngb-4BEvq zFqG`b)sN|qi0H(Rj*d)2!gMSlOG-*Yh)_padIM2e$z~5r5nzjZ!eVMC&_`4C@|$z$jm zzDEtQ{>3##Hx&MLauWgiENc^X6xw>V7^BpnuY}JVtzNHe)i-=k8!U&SoUIPjwTh#d8l&_{12cAR?*-3+3@&`g}Xc{g#YHFO&Brdtx4k zKHgGNg`vP=>xQt5DZi97PdbdMJZDggm0vN1=!lTfWqfHpAtUR#Ys|9FT7C3<$iAr6z4)dVFg2BR25;NP6e!WimEy&6s*wi1@Z2t}n}Ff2 zYL#sb*5@~e=M-dE&m$t*Jb-a%Uc1redi;irBWTtRx%ijr6+)rXqTl`03B9wfC}i)- z?br0QbS1MO)^i$ENl;r@Km`={*&Zg8W@2WMuX`8tC~;L0#t_X`NO2WA@kyjps04N< zxpu-SSg>o;e@R!8B;R?k0RoBj-HHGOQ2T3w&i&ibR-6#0ff&T|iwDks_tFGPIPhS=x3 zwH|9Go^P3n6zmCxN0;_7PLvjIimmO!SPgPTuW1uW!-59Ng}B zxWDp5LY>W#j!$L^dD%ec2*b82))J};~!2u9#3b9AUoe%I{HCQO-+`Z zq0F63;tb-`r4~&*$!B%Pt({K~+zT5MVpo)h!E(|-^t4k4q#LpDx8(`3iw<$f1Q zosds&$OqS?E8M3s&>QWx&=8M5Ulcodc9lL;w4vEj7AdPe_e5Q7wcqfU!%q4KVe6l- zSxt8oSzUKn9cG@ggsmNd@<4CASpDThJHK{Hd7u;hR;wq*l=lgD)8Ayx)2-mn)9;sM z0dbWfPc$fAYaa+H3yQ8eZ9sq556?vb_E>Fmu!`iuNJ{2xL<3gxDQUcb)1Lxj4x=H= z0fu6F6h?6iq~EIznJPrNBDQP`<*r@~oU$=x8gCgSI~g@ZyeX)yD(#5F*3J!n6nK*_ zuArZ;8hmEd93@pxG>d%Hq1tQ>Nm!PPb^R~=!V3IhskfWXGs^c(rW4W%VDql276O7r zfzU^G=GcluQup>#Do`Zp==K}`cCW{peq|Gmb#f}hMFi)VwETXve6iS$-((P9!3w>H zPXsw^>u}&>(b&8MlZXG)&7Mz}bjmm=d%2BVSh3VbKl)dSxOQ8Cl0}KSyx4Y!88$B7 zq4LLXEe_#t@y9cHVxjEj^Ie;p2LnO8gwM}KJOLs1_s6q6zWM4}f!|rNTZeVEbw#7` zS&}X+4-+a+&kKW3v-ZRepJxL#XCwNd&t8-%Eg$Zv?^?O08tHRqKu89i)la%ygB`aI zn>jPLk>VFIF1)m4m>8M$>y?ZF_MvZxBi?4-rw@uBGS3%b3n`kJC~4H}1Wg63pqY|v zO{c-dIiDB;J^daE0vBs_@U64cWY**fRTX?x zt@ALxi9;1GvCu}_ul94~*e_zX1wKo{h3Rt!)DWfYX>9>cXl$-r%N~%!UGsb4!Kl8CrQ7L6Fs#y<@DaaXOnJ1ad?=;!DrcMi22`Fl{ zC-X6D1$;ns*MqoAsHpGT6|shC!V!C^?TO;os_L3%ropn)=TaYo@K%SZnh{V7VdJFv z_TdNn7qBZXvO?3?h;L{Sg1=Sik3S5>t=QI_X$1q@V2#?kQUW62bXe@5>Ev(D1}swo zTmY{TZ-ir=cp$*Lo;5WvA{8EERwFU8;1-vH?UHlFAHacr`v5P`rgjK(x-j6+6O%&r zJgsT=dKwy!KP!0gG80N|CP9Zvq7+Vb#qsUAGSDzV-MB$sCJJ2@3Hi*tDzHUCu{3R5 z{*Y!|TEQ4(TwKLmAxs5t@EYuHtF6fFpn5MKo?Xk#@d7TT_(PuI=p4jx!@Y^p21za@ zG1g#cn~bH%j7@YepGjdFcnP@a>LKxE z8frvJN#B#YWB5-VB4%eS=Ofk|Ti`_kiT>W{cjv5sNlrb|o$(`n6=g;;&@uR@?RM{% z_7ZJ-ovWi&Pm&FA%px8!c#)A%_v>9Je(xp;$+Jq!1Yr3+sT_%_qA$YTv<24~El(QE zzVb}pa^QioJc>Z?-@*uoHy`%R0ch$_u9rB|dCVJ0&XeGj!INe!Hv4a>%=Iy*6NVJF zdDCh7Y&tFSL`sz@r7xTJl#K8^aJtS~k*J;qb#8C(Pwb1X!Iu*)YeDiFy+$>oN~I-HYWRFKA`FSpMu zL_L|~dy5GLs9!v7y)LjTd?sIMmm~zXXsdkNP|D)565>@_kxc*E?{JcC?|M4a;><_1};e&mlJF7b9POV@k> z-3t65b<<_vh0AAlZ{db!!;QaSI1P*N204`B<^((Jfo3jsM%{}|)}I&Nn8x9#jIm_| z1dD-ruD2~N4l4-|O&;>|`@QAG>4-*j8$}qJ zQ&lEtEvkQqf&T+~=Ph1^FrR!Q%n-szv>*WG>UAOiboOzF7t*1mJ=}7xt373GC-4>7 zE-cNeJPsp_?3bknU-P6C*2RH1=qHdL;hbDkzh*O{P{{?bs_uTU=`B~&So$FWqssL+ zGamP(Oiv>$N4N`}+gw31Dq*}{i6C&7F9=yNkG9fz1@B6rihT?ZG!24>74hR1l*YF2 z!jLtCp@6MrePEzTgmi?)j#p00lnKccuxt9t-m*l_pFRKdf-9e2E1?T-%f@c`o0;J5q^)_L~;eDXw^=GU8&v7e}R`$33Zk{o`X-GXB;v{V} zPs5S*`{zau`$1d|H)*05K^@rQba!(oLy(~sUaZbi9CJiV5UY(@8*7}j@o(!Ez6_X= zTDbMe6Vw~8iMwT&jVL!LAZwlW2n&dLXVfvqk2BoP;sSc3!_x{+etkBGrrJ&f+u&MC zmHTg*y=6WF>TQ^7b1MZlQabNh*-~cY!!l7PeQu~vXBCIz;4a10ER!ruZxkj~bi5Cs zx5p{iR=+oFy~R>e`c12iWfxxov@T_gKLsovnzBQH84!&Kfkk+`BEvv10PTLeV+Hdj7L`XWh$d$KF}p#tAo`(# zx7i3C(_25gjSelSY$>P!0A!|!tX<+FkmKBDxoX3LMm3vbxl}dvRYoY-cWzyX1l8E! z^NXP^z|;XYOzg+EQ;zG%hao(h*643w7k%~|qN@BVtK^aWJZbw)00LPw^WX$R6&qB) z8z!=KJcy27gq&4cw^$1?@-8Dei2;<8SWuT!zmc(89AayVb6)5cq)UAdWRna|pz#T7E%f8e0 z(fWfZ*nQ9PGI+t1lirY^x1DXLv!V@i-iAA6^(X2pX2*f1D>#xYh7*4-WvS{x?8`U% zLSu9gkgnEt)Kbx8#T`ulO<#0DLtpgM>(#AAP{>qgOi==Im0Mirqci5?*AT1Ku$i1B z@oAd++q>)3b3FmJI-?nN)oGt-Z!W|PZ7q-NceA54myHVNCvS`SY8y|f9Fukmg0`xW z8k^x6oq6DPt)m=89Uo1NfNbES|7JzYU8ZzbwT{7FFLP%={E;YOH@IX-nZ}kU+3!&s z+3V_3;Lgb2^USar)-_0D)*WcAP(eGhc~pe>bk>nLIFx0XnnoqETQw5^_R_D!D9zY>8C!PC;#3RMB0B1q}< z7v5CS8*fux0RRe&>}0X<#@k4>!QlU*Ru3?Q1w1x>xbTN4!!!wjw}+n-O8B9>SXkb4(Zl1E-tUQ@}TA9Y@ zo;^%GVV^d;*p(yf1q;S{rZU5QyiGAVjP@Y`7XoRjev|oUKUu?P-JNT3m=g;dIFiVF zG;_*(9*e%LblzLa&S7)-Z$NZ_q;)#XY-KxKT^R{yME%%w$XdIn(*`b>HlH#3ZzDm| zMUIU8JSJGos6d|82>4 zQL|q~j4@EO#^uFtTBj5i0XpLP12d3)ZX-GY*ziWp%YjGo zAkA?{ykD8)>lQ_(>X}UJK$RrkK~T#0D_4P{@UmAcma*J?i+HOeEAEQ|Qmx0NLKF^S$ZjAe>F7_$z5#1ZnLW>2yiSYzElB9`tm3|De$rQavH1;NGPtV zRDRet%TF>mLN+2^uv!|rzD|U&dfsrjbc{9F!LH|4GBxh2%DI-r1BsOS2=6<2Gn;VF z_Hfy2l0=#H=-&}OD@2&UDy$uHJpbYS)<>Ll)v?N|q`?nk?YlGMtojPl_m5$@j?mC^ zX2zL99nEG7$O*i@3udi8Hy2&8{l8jhli*y-KUlKB0VvOLEv6eS40cDdHbE;1oveX) zRUjaKdo#)oxEw-LdktuY6*G$Lep({587EiZd3G(_TxYspV7MR7S{)$4}P))$@(i+7&m{8{$?^fLSZE=T*j(#3HAD z;}FjSxa#)Jxqgu>*k<*FYW_8i0ZA6P6as^|-Xd>;C2cn41@L$LxhEMWi%ipFI(9RK z`iRT%#|01IV6Yn&J_(T)!=FaZ!UUxCX=Gf{G!fxnj2l`$$x@Q6~74mA{$gVT0XzYyE@a^`LZAv zE=7z2Hju6wKLov1&h{wyw1cJGds~V*&#L}1N#|DWvlzRuAwhq_2c7yntF&K#FHFZl z`*Id4#89XRwPD%caqBWU??E1k2x2kanxmTp*(R!k`RhQV73>Jo znSF9)K4YQD?F0tM3XUM9Lb_hu{dHkPeqyc6j7e*7tt)Lb6_D575-~FJ82TllEc*2qvG^+zMaAA%c(2<7 z@3YiTx#E=%{@^sfw8?nIxyeu8n7rqL1d?rU{;4fL!KqCb*sbmttQPa9FRMuH(XH#C+fOlY4`)h2VW`E0n)=d%wH-203kd&&?)?zkKb?qJ#L+9k@?W7qb< z$H2&_Oy5V*CdTm;#dx|h7(PE%Spx=zp%m?D>Wi$zf1zO^0-t^ypDVje?UJKOq7v#} z21Nhf;(k0A(idX0TC3oq282hWk3WB1?QI2W{HviP8M3~8&`2SRAjvi+L=G+<@m!TK zEEax^1~_cbSZyWM5c91%?idOBJ8#ixv4edNvIe}+d+wZ4vji+5P>&9RB!K0x#zBXW zy_4Dqk^9Ni1ilRYkSmfhgK)<5`(Cg{P2zbORmA>URb5N0@9SOwvsoB=ab1 z$Sj|VHFM>;t9f+H*dswdgWJMsm`$9F_Js0a*^&O*>92`E?4i$p={%Qv{(zyuG!@@! ziD5m!%L{JV)8WrwWw4!oKiq4ss1P9|{N*Epe@5C74E(s^Yki)wTP^NBd)4_Kw%pPrZ%{xMZF; zDs!;Z%+K@46P}oIMFVBFR6(Iyl|Nw)qA;~c;)%N)h+6EBa!0^vxntezHDsB}|Ccl< zJDbl9bn!N|k;NZR<S!2um*)imw)beC=Ms8mej1>s>K0 z!q;~XJe8IwV^a-Ml<|~SN>Xz7d4Sn!Ka_jfs$hEAN|QZpo!nr9tSjxl)5Uv{au?K8 zF{W)y!0$)L$K1!hm@cdb0iSAlHG`J0HJVK!v&X51L_K0<;&Yq8&|B?yOwW0yLiNLe z9BcKp&7~U#{P{@Ss0C#^gkqIK+Tx^_{yNrxp+_|GLi;u+7e>@dzfN!A=Wn)~uWPLJ z&(*$7UZX#nQuFP1Ug?u14@Zz$Z-2r?`7I@KGpQn4=0DncJtzBQ)q7%WHPi-MxtRZ>0!K5}X@KGyo2j6H|^+==j_jSXs5H*=5&Y-GlGO^Z5#8*! zWPUhL!MeOEmS>7gxV2YwigKmhR(E<^5YLeaeJwI6!h&L@vTC^1zA#C}*?#g+|5EW8 z=gKyY0E9Mek*+5(<|-d~NTbWt?rgEG_TZAF`|UER-pG+MZ=#*L%d_RXEXPmo8OMqw zqS?!_WshpgG$pLJ^D2@Spitt5?7J{C@n_FzhK9BGq{pt?>o|`4=Xzy?(~q9yolpt= zR6b<%j|K0O1>0|WGLKaq8CM=hU&rITo~ymBrbdy^wyq6|YkjYk5Pe4}mQP&j-_JMD zEq6XzEw_3`#Lxf;i@Jssy#Jv|9!m{Z1O&_NO?W?{xdq-y0ElhP*_u(Ul8*Vx>%=5LjCuH zajDx-XxKI1U2gGr>W^kG{8_8?Z{RlBvib7v<5{cjQq>J2(ozF?udq_)ZPA%3kNEB9 zJ8uSaWLVgE$g-56{T{}b6#aJ(R{5>%*ehV3yuZG$(EAncknB2AAx=$u;^RBNdK-Mv z!8JJs0gCzzfPl6&Cls-w5A&-e3Z+;>q{>h?>t&uW?|K@_3KE^LkR234tqZX`z)k>$ z8md8R<16bf(iuE#Um4nt*Y+=~yQh^`d>Lj5JT`xq%ZLPcdw8ofZ+AONnEUv2fZR^a zs(G-K?N&1=9VTr!wSPlSs5lU2z;5>A7k4tcJN6&(50lMr+7b2|f67@W?_X zEAiLA;#t9;g$u@#Ow~^cJK@EVKG%?r#EUhCKxCBVuWSPe%wa1I?6GXk9I2*(>ehjP z-N9JIRj}k`;3U})vYXk3f zZ1&R9B{^|j=M&`lNgtKCx3)*=z9qKPh-9*Zqv#afp!SGvlpIKH-|Qf_T0aC{*po*a zW=M+deGDp%+Z@XOUbXaXmXRi;?v zV789u=+lJ(oZd4fZ7l3`H3sCvtOP?383u@W%DOAhYQ>|_I4hoz!>%S2XKd*TXN?i( z4_QBAJMmSvWX+YPkjqp=XJ8jWe;7Glue~i#;PX|jEPJz=p7?`oG>Oin}EL`b|+;bDX6#CoA zJ#ehWW>spNHxq#0z% zuLC_QOLm3URo`8NF>|_8*$Fd6zA3MR{D+SrgOjo2E=SF^b0I9Zm7Im(&#~wTA+jWb zX98IZE7*Ya_GGY^G=kmiAZsh$!+F$7V_yXc69i4hC`@XHC0;mzvoq4Q=bxDS*{@3T-2BG z!sw~QC)}JCB$L#`s~G7}q;|&=O(VlnR)1o;+H8zCs`jg=4T|S^jGWzRl?x|{C!$Dy z4TSY%ituLV6}dt!W(uI%Xcau{Ce)dH3aR_B4St?KWD6(Pqk(uQ?{gMA*tF0u_TB zLM0~@+gG|3!@cTdjM%d!&LO({Uaa(b)3vX+7SH^SxlZMdwa+Q+r{o>JS6=H6iH@?V z?1E{tS=V``yRt*OW$$Pf~marh~RfC6nhC%?wA z`xAw|!+g*=scvLVymx$_VJ|m(4%!e8$IikE=^h826@^&(*EN##HP$W>Kh}Wh7@%7fRD$Q6~t%|q2@(K_eIb*tQr1H+P0AX)Pl8PtfQSmKRh zb7S%5sucn~j0SxZbpYb-iP9Ic#S#y!OWDLSd%~TLteKQ zrCbY(|2YgpKkFDMN%6ZBQ)@gC;4|qfmcz5ra>*5I?mVdvWzB|tSHnA9D7U-zR4aQN zlp~C909b&E@jt64tXk;y`?o<#**UmG~*Go_1&lBH@xgTj3C z3Ocq(OSSc$Ig{n4NRW@N9k-m;y!Li3ow+|h1Q+*KKEdz?&k^yMV(C%pw{lMysid3V z(%@MLdgJzBn>_W1VX%mm(2)=UO8xHfhM*0cOO3si$G1HZwb2XevBS_}1t0O4Ji z9f|iJK;$8e4#aGTF0S{bHhqI8bmGBinP|1vIkqKHeeLmk_vKnW_e~hA4Y}Kh+nP6T z+boO7n`Gk#oD$yyIFiM(beHtdSKHezpY_M*G8ThQ3Je6C&8NhP3vqG`7;||u9zR)5 zZj`y#>uyTe$PKOUwpzWCB$(GC);H+}K3ALYGtCT>#rOXQ-yZM#jOKRN0QW~VN;(GD;0z_G$_J# zA#A8P{2BqAv8;gSnpn^w5L{knS4$Dgrb@}0ZPE{P4ohJt;!HSB^%!cAyTlsPM$n-x z*nL#nlxr6|>JfdL`UNU4wJPZi(4Yw)yQWXOKV#(f+#qkE3euK(2}QwhKzquxfihd~ ztqn8rczg3T$b9jOyffNg^c!b8DL1=Tp0QF?3f^{KD9=SISC0SjbA;Mc4z5xB=V(1d z`~@sGHuCR08^}L;1rX5%@cuOxJqUliYyub0+Lf5%+iDu0y0z3gN98IOKyXWkmtT>a zz1R?4vPC#E3eFpbRcdE+D|XyTmX2*lT?1hUh88nhS3J3L=Xui;6|-?A!V)`Gt7nBGzcYLVxEclqyilX2tfTXy@|vc%$X!LyW8Y6Oig5% zw%?dVEV}D$Q>uwzE9Y-258^34MZB`7Xk;;jyuVEABos6hSS&$iC|?&xpOSin(D^nk_USv({i_ zJET6aVOOxkaYfDC31{$i|$LY6`fU7PYAN(58GrY0qeN1)?lsj9E7?K31a z;2P2VYdHkga0eW&N)2N?eO;Bg5GuZlC5CdiA{MSxc0ZkXUB+ci=ZMf|p(G5ciMlDE zskgmy*5JdTHXIsy0eShl*CO^lJ6j1iFZJH77>I6uAY8 z9848;w3OET#^poo*LZetFtNujS<8~$B>@ZG@5~-W5T?iiE+t*SnTM*!@UV&C?oYbwD zV^6pK8+wyBb66K~?qU&Sm=xJr6>#pBt@z-Lr*vtzP=0I{s@8e|#g`iD*=-kHu8{uk z^{B>L1wMsam@xkGkNFwf>VU&*^n*@BS?XC_7~r zdd{AUM0eFC%GdoE{N{~ZejM7~u;ZA1qI?`7>Sexg@`sp-lYD`Vb#VyZx+>Ay(##m{ zK)gZd&E+H|5^EGN%mOul0q226Dj?^yDa9Q_NWHVsVicUQN{}Rz{o7?Rm8ixFn>MyJ zwa1g}2`m_4w;PVaf-u0I&8;frzUksK2sj8ruIkVOPTx?X%+7}lMK^CPy`qn$;VLJ^{YmR;37sSpepJ;_82WTpNQ<1QELE z)faY1gGU5)1Zkfi%bd!%>c)cPLlvTA%Ke844PP)<_0)hrt1*{YwK@=J&-BfCGi}JL zg|6(nRuyxIlKpavkySV99~M6;JK;!*bA-K!*>Rx)?H$Tt%h9`QN=V{CdaG<17 zDT7D8_p^y~v4}3A)j`JCw&7hoouZmmg&h}>92Jdac~L_b5=Y zWY*GEfF4ik>DrlCCNWM@lT2-(nNxqc1EUXs>SEA!BbpL zk8|9JYXS~G3NO7{?2-`rAusi;RAoG*Di|7KU0BKUh}+F;3i$P-i#!w_e= zmiH?Mp&S*P__bdnt=xB*vy2(#DcJguxZS&u4n--&Cu%!yzVkCn!)Cj(f}`l^0wYk^ zIHy>!paY|?xQit#CM@uNN+L^svLK)g`O6Kr3;~AB3jcCfORJ7|3|M4aMJt?JGRPjF z!WK8FyGv?s=jduVJ5GMTrEKodYjknMFX6HU*k7+Zy}6R{Vc5+l%DbD7*X$oyWhU${ zx@C}<0zqw9b1_)UY4v~`q3Oxr-dA`lWx9=ij~OOg>$$LuA?$t|Z3#|E6veQcNHJj4 zL55vh`?W58`bNo2(Z6(z_+QeR-B%RW>#T7v*Lw8kH(KpC=`sy1=RKJEI1$M%Jto5* z?tB+7!6T!x*wU?>aqm)dw)@v#xx@b2Y}2JNv0=sXFXkvZetsGt6v598g>cf5V=Zpq z4ik-_VBiH6-o2|~F}Qm1?U@IL#cEO?k*~MEnw1~{PJ5=0LDPA_%@hm0kewflBiG@J9*-ne9vQo ziRo!PrvMt-G_j!bSeVv@Yk%kBj3lxI6f4;zs;ty;OV+G3%jOsFDP0L8wiU`AX|U3F z=_&1i;ou#ZK%4cpmUUfVDz0jpUvK`4+Z7dYc!`RBS$-5F3%ynyXp(Ei=Pv{@XO*l; z;9cZ}vFP@{(LuW544hO2BxG?KywZPFyKG2Fp5xF^PXz}05b<`+c8gg?6v39EsT4!L zO`7q?J-f{wv+g1MUp@$y(=>UzU6SNE>4yZWi zD0P`udrW;_x-CnX5%z|<^?tCq?juian6Mzkv#`Q&gKN_7C4>vMi7J@r{2Xn_b?Ki% zkD_+awx@}dy(;MtME+@43u_}-hdbvCxpda3)bx~`3&0TOZRXbD#{Y~w?yA$YHbFQ8 zQ`1TRi3ni3UsDh6aMCj!5}muQo*&a})wm+jdF_WMl{)ByWm-L!>y0PT<6&+H!ZcWA+^8U&j|U3hnXkLMWF-ozj3k<@E>2p2{qA ztX)2jf-Vz(i@o3;OpqKN$5*vnL9su-vEyYaAfamR@635~!wmdBV9Nlgmm(PGknLX# zIQ{T7G+IcUU&f%LsbF0uOQ-&f#N{?{Wv^71LUwmBPLivOB;oFEADD<<*P>Qxj#=y- z?6jK@*=n`MZLc*4H>;`J+DFK9SZqzalg0~)fBJpe;_A4V9Rtb(Ae^hn7L+w+0Hf{V z-DqB61}#V*E{7T7JFOdWdvIu4-SNGOSl{^v$$*q z(ADxaBoQ@3n*aJYa8gM3u3~Ttv6Nwx&Wm6&eRg60mOsSae+uEv9MTu2TB~B@V#9zG zW*hjDn=k7rZ%$+lOQSs6bGCI`}=3 z4F4LT=Vcm~g>IA?R4iu3r=Q$-1?_5$_j2RliXDr@A@qHg$r3`Fz&>AUk@MsnfHei> z?|JW^)BmJGbMryebn_nYtM1!S@vjikgsu9Uk!``d&N{%aEbbMFq^V~0sDieg zB`A1^_8=v9`wgmGbci+(SB(}u{bs$m8H|IpbRkd^yt{z8Fx;q>PF^Gm^@b;nh3x@ssyazGaR z?-ZnN(|%GGtt-9#JkA5{bI^HeL_S`06yVe?N;$#v*AjOuD7fsncJ_wiGr5 zpHWRaj1CATkiHa^z?Qb@VX5g!5iO{xY;sul0?^1%*gJ5Qnjz)Qd>CH>Gg;c_&2=9q zoz{E7)X{aI)T;GGB6o~)ksEJ^*vx*JIqawJ9lT^)L6{NYyF=F$SCIJekrL!I!8Khx zq~oXx$tM%BE;d#Aosxd=t^!j@SQLZhE;0_`$IO;P1tJPE)g1SG-k*dm9P?UAMIJa* zjIr2z%W?{(*>+tbrXk~K9O`=_{$xo|Fn6u>U zbB!wo8WY6B6Md;KO5B!O&mxXSh1H@;v}bmk_n0N|3LU1 z`O|HdX;GeJo#mjygdg48(W%t))CT9g3SLlWcldnGGdtzxWl%J~&eV#pgH=wPW`q}q zSwchmu{e!bl@yNHUNlhiD<--i+;hbx2xNcCuXb4lTgK>cSKK56jOhyvVb|k@vZkzhEjctUhhl0~zJKpMO(gL-5}Mss+ZkL?-A@Pl!tB%Kb)zPQi`3z5 zKro;j33bIwNIqUV;94pP%@N5b^q<$MhRlvM+dF;c_tJNIY9l)0d?OUhs$ZIV&{=s4 z%*L21w#ov|U0J{{>AzAd9Ho8DpaS90T5%(aH6EWuNhowXkMsY)%zsJyaYB$36@&D+ zZdpIy9H4N`6|2AcH}lHHCqmS0=k^5;TZO=vhUN|$ZaSk$!@ZGbNbEbocO7^k>Lo1t zpKl%u%`1giYEX@mlfl^oj_Mf&)$APfbfPSj(unHJDmi& zlwlPlY`Nnd@C-wq1d=f~U7%8}gh~JHAQy|zh`ck<05~O44rgPOR){&WQRli5ZV8$- zG_hw2*D4t+jVX2Zem5{?b{O@2UrJYIXWhhWvNAKyBHy=<7#)8K@Zcl?Jgmz!!Q9C@ z81>ih?@7ESG0)w?GXCs0dsMLnq61FO=B>eg@$D1pp>maZ_f(TeunX+&kqo*k9M$}6MDokx| zfj9DX_uoD)0>*C^;W;*Q>j~XZSb-aRk-dTxA{H>?iInkqLTqYLp;Rv~WbWO#NOeGj z%#j#gzT5@+5gCm@7daf8D^m#S$-fCNZN3|6`C$MkhGyLQbbrD35Cp;{occu7Of*}q zP4_qNS9HH`^jSYmelkVGMOlIEgM8!|XoC)UglrCCxA-L-Y}dM!C8uTf`~TYBbypK{ zfAz-@1e==+eEwS4mmzdK0uVZR3TK))orRv1SFvteB;-ZTWyqCJcDg3=5{wRbfBNNj z<*|7g_HX_aZ8w)rgiAz-5*xqCo7RU;d?2qKejHE%uJuP9%Fry3Y&)X6i|DfBD$+ks`cnnUCya+bgrKGOrflN7#e zk$@$)ER;_S@?GhJKm4lYP|!(%C^d0!)%+ zKzP%$H9OmlvK`QrOADr#P4mN+Gpt52rMkiw0py8T zkY*(3T{1>QO__*O-?e>5V8fiGKx8N~H2aL>+kxFntZ8c@r$6A6x^dL3mNg8sGu9twj=mf5(j1>SXTYCC=8y!oGfaYua1Q>W{UNu*wjc}<;RyrV%x-^ zui2s08jQ(bD<(rXsn7^D5Ro&O^Z9dE7(|wdMw2pUrE1vOi+BVJ0~MZa8SDV%sF3Zq z?Ods+Bd%sioSS-{%JsHT7i7kc@q57JgJD#DUAv)(0N=J>}FKRN@oYm2{-BB>LTXu+SVH zUl8GJFPwC7Sf^q@TUUXJim%1$>}ln(?k32f7rG&77hln`$m@;67R=$iHHg41ybo#H zgqK^wXuDxrC$aFv5sCSef^DhC=bDQ%9;P044o7)72kW{mCQN^B$10fF5tm*=Z3=@t z;D(=0g&k_-GS68@57M_PDe#EC1_k429cju2@yYO}WU61KP9Ge^Rz@J@0i8&~*O_SqDOrYW=}Aw%N=FXsOfk6AO#do=jw0RGnMu0XG1-~CDNQot z;|VdMSnt3ulR)@jk%B4p0^#WS*^yK_n56+(EG4r7a-sbB`Hv`R_@hi3sPKM>YFznu z)}Ud5Ws-8ztAqckH99frIJ(zHrBy03~ zm`42ZVd+rpFE5cPn|6oZQ4|ssQkJ*Iz5K09+49 z!-N|pL%VN~T>Uxc>M3??pVb!J`+xh7Icck?MwBCrO+C+rQ zzu$SAB7=ZJQnZ<=_uDikgastWmYgDeyxi@^jpm77Sm+&wDrEG+0y*Ik$52?1=V~md zc*a;q$qiX!PEVJDI0=BKtF=O%#T(nUsY?5B=$NyzgE1DVArRvhbEYWrTDHr{lGIvt zZG@t$*-;728o#4eAA>+}Ziigi-^s!<*;ELE`vT>3@mU>JzpQ3iPK?L2yn!|@3QO~5 za($ub5Y`9I(e}+79D#l!2?XSUVQSK?!OVnlO+c*5sATswCzhtCTr$E^8=vkB%z`Ty z3J^#W=lP^^VJWf*IfL)9m}W4F6SN9@RXQi%Ea;AV@$Iiu{a({0P%f=KSok3rT(iqP zbZXCORJY4a-BeH)1HvWMi!FrytY!CS0_e9$GO}uQJvQRH&y@aAb@~>nxQbM$7b*)z zTx5^v?z*aay+$|H&IGP7iLLz138YS!`I=mLpOI|9YbeBuwd|#c<<5s!I#t152p(}7 zdVkaf2w?}o{J+mXlayQ2Db%!|1`#~}%#%)S#KD96B~}4p51&2SG@$JReEujd+`W4z ztzEN9GM5JQ>Y-XS=q#Vsx*;95`R4X5lHv8eme&CZwVIFsaIGar>~vgiI!1S!vWhmh05j7MZF(M7i`- z09>m4*&@N3<2XHf4DSyi5TotmI8Ev<&Jiq-tsB-v^@S?eQ}N6cyZ*Om@=H;18N7xCf~1F&fh)Z#+%E{0 z!&2xDD_|kjK|{fA3#fkAg;ej-LOP@K0&3J{z9N=mpng{-oQra)c9*$Sua}zTfjJ)a zu9z>a+H3xbt(!~c(J7tg(dlfhUdfYEPx9WDur#jtoc@1;L&4+$q z7=D#HU^@M$SdHD3#*|`J`}BmBDijfhqvuMiNopY)$<_zvE||Im5D0wKumsSt)M@I5 zs{yq=t`VH3^Q~yAp&%Kdi=Zo-6RKJS-NFRb&-`4qs8_BR+?=@Sw=pqEA1a;dE9tH} z0FREcrn(vdZqzQo-GN?C;yTf-GAe54Zk|iJamX*^QMCVC87P#c8$o87_zge*&2^(9 zZiuk1Q(?g({lfHYZ|Q55ruG$`i9xDDI4sOfoebuvpo1-b<1Ex9@G*5n{X=|X5xy9> z*nam~7os}kWf=u0T4;BbqeeN--vDtUVf^d%{HUxrw0ofYi4WWwI z0O~R@3&RwPnrp?6wl7|fJUSZqvF3sBc2QOCcXdVZdjne83DDZ5ud88PI+Yja7X^OJ zb*&JH$0=0x`6-fh6>+7XNCH7xxoL{&T=SS+QeL%2hRTBRMZ5m^`{-zm>(~$olpdU0 zSlsE28qvdx7M&a}ESx0iPZbV0vJ!01WeFo@A<}bwN#q3}I^8NVULcD+yU@5Lgmd(UtB>6AjQc z!v{;ySjZT482r7nTQ-xahG{h(9g|tvaV#hA|F2hODDNe1F;I-?mlyV3{m;3V1dB8xPH_KSqr!d;r22G zfpX38@txD5t+=R6|10T!%$6kLVyjoLbUG5d$>WF2#5f)TaT*x9+vAs&JMlNCx7bl& z26~zKBDl`~_n%Lc70TB>dcR3i#}sAhOV6&96p4YHG%hUF%`~868v)%?Jko#Z`-5e4 z=IF;L?sB#sdKaiEe28Uqn$AM}0T~&KW{5J-smpW`hV}d0FP2BGPV=e8rRYq%NGi?i zG9jQ7ZmqtHCCwMEuVbNhr$U(lQoBn5ozin2TOozw;;Gjg1T&4|`tt9flDjvyi`3tR zk!Fk_pr1Q|NK!$e^a2wyW=k!u*8{S?je5EU|p|de|s|oU)U&H9yO%M zSI*k_Es{~_$)=+G{s_k^O$Pq z1EoRQ`*8^+4Pgu5!f8Sb5Y948i7gC}M2*f5uqDEO@5Ar)XF=Z=etfnDI!|X}nMxP@ z{xKSO_e*s56MJdVYj4vl+dra>Z+$>tA3j7unQTtS24913ez=d8@%J8I{Sn>y*bW+* zw~@}D_>u(TPrGb3)$f!iu>_>Q#&zd?>bX$j2X%Y>0=oI4?xU9)%d4vLVa+j7Uh)UJ zxnM07LC`>Eln3ReE)D3|6oTVbAP{JAhYlT*8v-{Ngjs6C)2MxRx(c4BsjMkzs_^;0 z_R{lewuSyaD#%9+xk~yST|Z(NT|H=^WJsY|-l$=NC4hP@|E=3a7es=zx|O!1{mP8) zBqzoIjJx#~)u=F82^2FIL22!Y;^II&Wy<7z zX)u2WL$GcbIb517{^d`1X_<6l2_&{RoMTb25{*_YrbzT?Ff&jx5|wfxbx(-#q^lVv zxXx7Kg_>H3Q3;5FVCv^dK_FqB3Tg<%_`MH%h+bO0L9B(-E}cOQFtYVBwm?|W)$Nm~ zYBjn)ATfy=Yz?4>q2q7=MiUqBpua8oh~E6l93q}Fu@xbZr+ zX+foj4>%R(5LP=jtdlIFEbY66OQl6}viNu*_{@|(#0Zea+dd=WZ^t&}eSQrBgAjzE zMyy19@zSd(!LdM8>vt7&hEN+Ze5f?b%h7E_kewvjJQD~s>&wnLi;iYd1M|>MBO^tR z8%@$_qwx-T;Q62LyiN66!YuW0q-8iVX-x25+K(`CWF)$goQ=}rBkF{-*0<=-QuiA|yy2hmH!BVNIElG^!C&P|d=q@bG)uX77O(0Tb&es4euB1k%N@YH@?Z*HWpN$$e=qE|zH9`MKoX?C-2vJ%>LZvg& zB|SGIS*{V>PjJndA!K;pWMM_d<|fKHegDlje>nt#09RPI9D!e3=5_>0g623y%Hk*? zKk5vieeyMU+v4pMhoMcKXVNMC=2I=q_`Yn8wA_Fz3aPRwzkZy?<~~8su6vihDpkTh z9MW^pb$sQ-FH%T|M1ifQ!^GCgmoz5tbvo}F7Seql7PndL&a`=knM zKa4vnH#b*VE-VzG&71Vm=DHI5oYpOA|Ni}s05Mrk;=^b1OixU%RDc{W%wR6Fo+gRF z%-xtYX;LJu)TJrM&VY|CPDHld#~**}jAk|G&$KeZnn(tmX?%%EjTrr!s?P0#Ik`H4 zCM1f=)BpUtBo)BQlIsRpX-uYwNy)JwP@b5mEly18ix(e)O11FQZ+?A^2zWE2Lr5gK ziC7`o7^R$|hK@<$U0Ny)9?-u^6FG5xV}Ko|NlL;%TB;~5C=P9#sjiu}X=%~{VaNIn zQN_1G@tSF+maS0JB1O(W|1C2)^|;S3#zw>SDhVZMb;I|^FzIU+Adjc)=O085>9K%b zUkR0#7dd(7rUeO3a=^>Pp_*LMf0;jq6|SN>{r*U&b<3mr5>G%|lEqT!*6f;x>5hli z(R-hMgRxMw-%qM@tj-QX!#{K4gLL8vMCu|!A+4?WWpFO`-~a=AxNG|-^oRLtsM)AT z#hR+wJ(o`DHJ$4BLIGbM)w^N_lSV$(x$FU|)A<1*N6aaygG%roC%&D$%v|sOAf3^# zKz~RUyW*o#UYIh13rBnhM2G?D;FGp z4+#Y*E`?jJnRZ)B_eGfVd@_>1)p@8Yt9EX>^*CorP-w*9Pio zLcz*24MRHd7@YyKb=P4@BWKG1ZYAsw&OiPp$q3;i6Aq%P+dUDhJ~ck^xX&-F4smC) zg#}Xm1Fs>bAUavDKX(E#T|3bwSB*GD+Mvpq2n0(hR8s1+4F9r-=(68FOmSUNMb5&u z&s3_{^&v_hFqg*8f01^5_BmnTYA9T;=1qI`EOfM42zs>1tGZ}?cM$>y4^hB09qX!VUIcxZQl=h!}m zHa-5xLsVRJKz!Lou$7jU)AP^$OLG1f7vxdF^cl2x?p&HXXATw2nni0?ELSci-j^3& z_!m8}Z~^7bm?4E%3-a?N{qci$-*IMp9GMIfxhc17*+RL~r_1;7{RigHr`(w{SeyO_ zl^#A65hgk%*$8J7Vsef2Fr}?{Hi=uqNEe0kNHyW2@n# zx-N&+-0xY_?xm4z(IMp)F^+-#`_Q!`hRS;&W4H_vzZf>)ast6W_sp|V8CoSp#j;-S zzx|f%=baPANj4v1VL(N6_%AuA)&_k8o0>9fg%O{O6x~ie}tUiSVfnhlQ|9!rX@@LMZ`TRXx+w*x{=j-*wwTWvOwNEC) z6xN2>H;{%q%g|WLxie=S_qoOW@#3>j(b|>E2x;EZGtBFgnx%@mWB=?31R6O~49(8^ zJbrzH1oZHya@OPy&|$tl&%f~zitF{TRDd^T>*Ml?PtudiHqfD<`gD0&iF3e*n0Qor z=|Kwni$p+&DWGSeJK?+&zCbXKRRLsVyeK(`haBxPNkfJnBp0NwoQl~*d2G#p=**k` zN~d>TsFDKM0zhRuTB6kNJd^5ln#IEW#J56`CW|9iL4sO%iqVd59f8CEpMDRVG*k*IAVlg1kOw;FPhNz6Lo;!zwFk3uqKQtfU{^!?gskg z>k=yWkqUmY5cY;VR37xI`R5`4ctM0v)KoVV4V48HR9_fqohRPMCo{rzA0G6EVt$lt zKt0S%+-uU)M(1^*E}{&+Pl-#1XvN$ArU8?mrMg`nl$wmVuG6I}aQ)t>J^2aJfO{;U zQ@YHcxXb^^gf)wPJ7=k^t@J#q1_Cx|pJipyu?=U?RM1x;*_%2boJ*q)RFpDWm02V* z2&lN!ai5xfF*m7XiRmiv*n&6{+;q>ukfKV7-9_9wu`vN7fZPO8Q9E$=u~p_CIw6I; zew6`c5)6*kMcI8Uv9n!{w!dcm-4)ex%%O-d^ZKLHmvOzA!bs7~$Vb&q zsQ5uqQBh2xBT;OO#u*|N^hd3CIC$i_tUQYpWUmwqceiO%Zxq&j$PB5u&#@>XF)f_j z9{8 zmBI5$o|3P5Kgwi(;8yeNeZ)oLEiI8=cb<@smc8*24Y=(ksWpk~GhI@W<1T&ZCrIO6 zKy|v!p}MGFxg?j~`{X++cc%UwzaWcpZ-iAlaJSGfqifyT7lc75DwkggU3ZHM5#lke zGh&4=wh8x3RPZ+tIzpJZaj57pxo}O}mdXYG#DXMR3I5{3<2Ztb@Bn zxy(ehz5j+BVHw7fN9?*fMS=W?wRIn>`!i^?>5Cx>cWp#e z-GtBUTK9mST^@+pM+Avo7KOgc%8KC7Pph{U3)pyhR)L2%677KD@ z5)2)3EaXU4tCuwr)`po>yf`>jEhhwXIDCMXzVkWtpR$B%Up$LW?K|zn6G+!ww*2y_ z-epsnz+O<+Aq1xX%g-n-Z%n9=GOd-v23*K-?CRsh~gFTH`g= zAa+K5?DnEs$n&w8c10Dr29CL0dhcdv6)k!CO;`()m8 zAEQx9+$}|_LL9N=CEkdDB9ho`xRViLkJ-JSM{|+>SQw?n9N$k7|ELxMK}MR_XBLZ@ zK5&=?r&nSEcigv_mVWe=h+E|Kq6dzQEedLvj}(TgzDs_#MPPLVwNMLVn?6_j>Y$oY zY^rmAsvGc#RAFZbwgSYkX_jVE_rm6yXHsQ-h>AmH@;OyW=99GM$5wwpEk`W+Y1+B> zLzR6lZP@-lCNYxiHgPKltHXj*es0q=&a^gHjS54KdjhV9u>a^6wL6tGR@k~*f}7Wd zkf2$bSc&m{OY7_kdRIws)9a1g^m?0)C1Bc)n|%o%*@3r0!5WHgf$sK2$6lk79HIpY z$g9$J-p7k@bPITMZcMDgouXV(s&Yk^Uu=vjIzhtKqJyGmiiC86O(ZEr31MRi7y^rO zfkHV62c2!l5{#6-fA5mJ%QH^AtJHqoh_{-WlPAPu-vo-~B4+x6`c`$H zO|_(*JfmwK6T?EOj+g#cn0wM?fy(ZZuEcpNaDVYkRqWV#KJ~xzaXJiPuE|~;gMnc6 zTwvPza=Qu~tv;j^AvF=3!cq{6aW~=K3%H0n9ExaAVMoXjxr-Ow1mRc!F1M4TWd=Ns zATKVD1VK$dB@ECK;RLH!x43`>C0wst@0b`4oR`vu#~nj~&Fxn~aUl^@LR6O+!GU%6`NL6_(57{}{LN_U zx=LOOYlE(Y1)``Jg$Qc>cTxWI`84h+X(6wJ*}kyfNg8kqa?@1O5QJL@;?aGqRoVVA z@3U|u77<(g>hAT1b@sV>WT~orztet66pfe}CPHX>yG13%j>Q#rk#<0)dj=i%ZP=ak zL8`+tV3I^sP~2_dhUGRjI;)z-=#Oed>Ly_GU3hY0uZI(1l~`f^6QQEfuVU8n`QG%| zLF(}P2PMG(E$Qp^W#QlHPO9DKerYi;ZAdWVgvkO!v@o+oD&h42t+-AF(hCgp-qB$< zt~*++Ih;Ni3I&2hdA99i6YUEa~&W~A*ab@C5UwyP(7ruMute;=RgAV zE*BOBP1E*}6a0>K=S6-u;AC4FLG7NsQrY&aHc!Lvtera(ON1@1$8t}FZYXE?muu87 zz9R%KnO$C229(M&^t)2Z-R<;+^fXx@LlNg!tPtLou}lsfIuMmTW?J(br9+)t<%KCN zEsnBq&G~jLOMm$>UHsKWCRVureKvu%bz7DA36QM88uS!`ER`TYI^3Mf7kUP z`Uc~D``5G2NzK5Bfmg`P?R){dYt7hN`-Sp@U@mw_bmpXpAO4X56IttWvK=8?cq_84xaN62WyJ;McoNzschS{QIQ%Sm#N(li_#w*`%lQ~N zWFTEVY_N=smLNK;VomaxEic#p@WFEJU&Yt%+O=!ROx28ygINMO8Q?FKeBi^ZLH=vc zmy|K+5$QgR87G(=ShMFmI;HP}GPmTEo{Ol#xQ05J-0> zk6!mnd-{4k=FrPKKbE{>#2`GuGDmX@((z{j;TDi~{aP!8X1sgbX6knFMbh9772wiV z#MKuGtwd59pFtO$-Hz6-TI!hfC?3p8Qayd}c?e`9*kk>1u)<=66Wdaz>hHz&=-C6P5~!8e6BOQEH=xB6PQGSnv4s zO^R+wNs$odwS$MqYz^!;TA`@<>+#Yw&~53N=Asep_W!ka<>6IT_ZIv4TD6W45;8*w zGopZs6_Hu3C^9(KxqYqH0j*E%@Ls?7eTtw=DiyWbYJIj^^=YfMPRN{u8F8$&Dh}vV zQGq0cn>%E`z1H6Q+;eZDp_O85*B|TSlH}fd&OYb-*8YtvJ1T`?Fnf)lrihMq*MVKg znMXKY4A1N4=ShW87UbZoQXs~AO3J!;aSQpj|UH#Z8 zhxv5b#<~m}?r?9EVg!4M6SqP)^&$QHa6&*>FK|bDpWoj7dAcPU-cx>7S9}Zz?gMnb zV_k5~uud2qkFNH%KC6DqRwt8e*UpJn6`8(WE4ZG+4joLb_|WSTgdFy37%0kIVxrlUb#arTF&hjcOO`BN$h>msC&8u+_eW_* zCkudXd5o&b??Z~l>hFY7Vj1r*80mDQX|T4jfx8ieOq$GAyLlOV!2=9MQMY~MTuT)5 z%-6?TVi`Wo62&x%T0t|V!_hZ0ob{EF*Krg*$fm=vS!R!MKWF}9#FYOrY|q^G5g#~| zD^TDo&7jBUzJZ#f7_3X4KJ(-s-53!J#)APbbYs`UcncDUeQ<-(sIDwEYuBux(YVF# zo?uXVl@#y+J!9g8R#jRwwAMJzxb|vO?B^?C4imhVP-KDE_!)kO!HC$Eg>pGgH!X6S z7$BM6e$>X43(qI9;(=r-s5PYMUWcqLha+07s$J?e8e*X*d(O|TUTw+`IDqrEFfIcG zh;!&?jnvqYNAZ}pZuun214QTKLvK0Z8H=?wwa!ptIAh`d9HfUql^_uq!%C|EmD<1A zD^f8$sBbUx(WVcg@W+em*HR|~h7#}R^(gJau_L|wtg0|Qx5^Vdj5^4R#SZq^>grZd zbELZH04Mir-{bHoPHMGzU!T1!A zG$tK{+zj$Z(Re0%T<|=i@%0cX>$sok->saa{>O(NWQYu#k3b;sO1^v68E%5EUHg8x z{|ekdPi&+%zV~iU4hZXmQ8-kNwC_1>@&p&kvd>v}ZkRxRok)D}nBXPhd4T2&ND#+@ zbHVW(KW3!Kl|;_=MD46T6dCa^Ds&ZkB-nA^NK>9j*_~fRv0fo@g}L(LOU$qD`h~gk=eL;i&pDHZ zERYBc;(z_f3!ir)V7Z4cMV%ef+aw>ju`=+w%$TDGTxIk1e?rwst(=Wey)(jFF#%W+2 z$&rHx&@;i`aHPCFzWGl)&JfUt)+j+c1*8B2cTjZ|J-#1aeyOQjx`>~@re>-6?;l>l z-8_z&I_`F7jrY}m{2`CGc3F*ED_qacZu&7w^&<~9o%S-n_HSzz)5|%qvchYTy9vpN ziiLY*+qMSt{>HaBj|@f_=h)Rx5e~yL5AIp*h#^!Mwe$Jy-JhqOc$}M3>n9(de&PvS zOROPAfnZIbHv*C!(6yY$anxahb2QkIzk+v&fr?@Ja3m?v#St{_#lijhM90M5nv~nL zV5CYI?unt2L1qBQbK0qsb1Kyk!mRc(1sEtf$-Xyesub?Kx4R$gJq_95^=nr1J+Hp} z5<`+4E^0SM_^#u|jxr6KKWTFYS7G_~aM2%`-ji4hTCt?CP+4ty#J(JFX z+5&S>pFT{mV~$pJi5p#whXDE!Sd)1Eg9Kv9CH7C&8-yuAK z&{&Y$o7`2!)%Q8Xx zJ>y1@OuzcS8QvT(E#fx%6mhdPL zQpKi;14cXU$Bjl92M_XE{LE84ju57WMhym$f^1G^u4g;*D+smHV=ma2$GEDlmSfuo zSkk2?y}j44ju;k-dka-%@fl~x%fv&$J0p=UBmYGM;Q-_>n@voO&qNPgqrHLWzmhPW zkDYEw<7Ttl@SCY|4&8Q^>yDmF$=VJekg=9XFd}969JA-}pPE_oKd{DdGaE4*_#iZz zR1^Af48^w0_Qsv!#KL5;9OlvKPjCu35zgPm8ZsyILVQ!vr zow;$w3|16@K&aDg4R)`}GIR2YCuSQ0eFYDbg?7#6&Y12(Ma9neLzF6f7hYFTle~}* zE(YC!#4yVU#;fdruX7hTYRF)Y`wn^@)m<#vTzyScB0Fo&Z0avikHQiW2qa!&jL^p9 z3FBx~f}qkP_uXq2_%I&w6BK_cFXj#!1pCy5eIr0eZ(t8)X@#p89d=fV!tRV8Gy69f!Cc+vT z2sAOoXs;Pa>6lSRF_%QPZyF6lG#!ta4#*E-9bnumI@if@jOc|(22i|0#f}>xx?Oc^}D1S)m0az%)mZ9 z=|=Y}cQUd!&bpo!ASx})Bw4`|#Jf;-iq|1jfDjGi)BEpbdYAh#?wwtDgCPSXsS69a z3&n#N9wzKCQBjp8kV!5%3{469FOuQmcR_s+4>RJ+v#yzD4NNhU%8-Ai1uD%#xWo=DVI*H`&>g9E&r+p8?VDO~+_Np=s^`Dqba+?`F^l&HoQ|c1yS4^1_ zm1~BCxs#l2J+o+4O%3%WoMfrfNIBb2lSL)ZxX~lH3#OM>Tw=ec$Xs^uMecL#ahG@L z9H|l_GQO*G85wuyD)AHIP9I*~>tK5Yo z@qX@}?eW3mt55j;6npJ|eCZ`_)IV}C*4SQg*(Ln`mtK6HMGCks)cdg4_^}5cW`SOF z%ISwMTeQ#_TzDZx2bk{mdv>IZ7x^#{2t86LL>@BGoMU(O=UT&j#)RX|z^Y1aCa{)O z_8j{5sWzzi%K037-B9@z&J~-3*|TSoi0{Aex2B@RsRr_1vG?q=)`MhEke{A``wYK> zhk)GP;>Vvb2Ul0S9G6{BkSVTFbHWWEh148icKUudNH~MnBla6=a#%CRcF(a;j zA;I%Qc!BZc;!aUw64fMlSQvM=oEPAA#UmL+Hv?ZMmu^I|AVzK4_2$_dm!Q$JoEB8&xS$paAiy9qA-L@6?l>ehlsh`S5=-`9Ry?6gI>Uc*E1D;mRvLy^tBE*K{Lj@G7?~=Z+W7y$`IzqR{ z4=HDqN9T|jssf9gI2t@H6iM8F*PTvQxWpyXLHaK}w~p&x=_|Dkw4Mmcbwgzr6bzl- zi7NsC3FA58x}j39y28Bs=4;*qa?O!#&GKq1FCqf@vUaTdhtT+4+)Hn7GsP!Nw;sn$ z=BvluVZL(2bhG<$H<&#RznZy_-9}9_-A|gsF6yRTG3v#43ZttU6;&{}*d^itee|IR zqHqmj=8a9+*m*XAoSid-(p;ACT4Thp5-Wo`GIW8&B9gDAEP-@YLva5;FM%Mr4o{+_ zqa!^UH~T=ZTC$Xc<_xEky@g?SV|3DHncbb^fv!AYe;yAE9;%>1!&sueo}>ZqgldI$ zm-?SqUP(jl$|y5-JsR325QL)oRaR20s=QMHMY||qVKanqU^q!0MQ%-SO=0*Ex5v5Rdf>R+ z^(l6hb&%3UiLm!TI3zRUiXNQWpv!$gryTb)ja@2X9=`V;ZWKU52w#@k-S=a^{~gEe zBpFUy#%sW93J=5*-i|cFB5BTWW?2bCjJ*E#_;BsY5e_RZz#j$3UeUa)HN< z9myh%YF|n{VcfC&+zPMih^oGCoiaJfe|0T!o;^dG_L`jk?Q`5Y*`I;jAoqL1*in>? zuCK3;JdON>d0ak01oCA^#)XF(8UMB}ZgR6({px1ZW%4{G(03num-*_^(@ck>=9sUI zm~H>P&irQndb2IHd6&!zi+3%L7&?TzIwX@}EM{LfwbdAopqoK*Y-}=^cFe@IHRNb6 zgW*Sl8# zvu3+I3)S_C`QV3Q0OVQl&@%^PNeziiB=6C5h$gqwPaJOs_UOTqQ1V!ZSE>t@BW#b)fVp$xyUipd)63%+wMjWGxWM8Mt+OEwTe z3g5$S{-DcY@2yNaL184kXFzq83me++1qm)%_>A)^kkCi`zM|CBEm_DupEWCLSw{N& zsulD!Z=ZJ)cj-80YO~ul3tivP0~*-7k15%2A1@u;$&5T~keP7w7<2Z?r!XuBPa%}j z!bl(3qss2&C;4XA3<(6JiSTGuXIFx4c3_(Bxu;Hw6d4hQym9(2iM1!eWV%NZW6(C1!YEV=$(H=JnJRnSkvfhcujHP#m%|a*ux%`p~ zUBy~D6m=BwUIMW$d}aa9Y2l)$P2Um_h4Zd)Z$5a>-BFbn?%fc=LQ)(Af@-f2!os>= zbly3^vdS!3s!e>>(*)Ax*9IC6dqc9^MMtJwHGyCcF4%pL=4h(}o0-i_qQj@&?~3mxj+ zx)ig-x0l^D6?N(u#o}2l1FdKKK%!gN&9cfJ*@4~hEjP_}6)~TaKtd18hBsa{1N!u2 zH4`W1VU+Jr`YL+eH?wh-9lq(myL^g8{{vpQk!?@$K`rFU!>ZM-M zJx&kBo&#qgwL>7-iC0+TPTd^8mJCO=B$;DkNvK^fd?&(HEtZfkvP2T(PVqV8MvpWm z*4Z7p;9ajn(hM0ifCPe&A-s!o&p3^_tJRhqD4E)&(D#rOGP#b5pb#bjNx)Dd@y{L; zR5RIY4@2ohq|#J}ghX-BW=E-M_hJ{SLh~iox`$61BP8g`Ts!gqwRKBaH~~pn$_1nM z$L_#!tUFT1d-{ZNE_sdPvd1vz+G(!5IP!qqcoPt9|FSZY2)vQGb7pemhTKyq_okk^ zJywJi`&LxY;A2hT?cw?!)UCpK;JEiJ(Y<5uDHwj-XRP!??~y%clt(xFB8IE4x{5^s zSO>fhBo0r4rPcPDo;2Zv=y>5Zaox}d(s_UL!n)Ngxjy{h0lZh}wV*uOzVEKvZ{@Rw zgn1~~h`K z`l!J5v(V_-hx~=rD;cstSb_TN&~dlBVI=%Ro(3LR&$1F=kv4n5-g}u|Rh29P=uzr4>tQhArSz{TXAeY`JvZ*a?RTO)7NmqS*dD$*ZAS>? z%t;ft1}v+#Ko5xP7fMG;f=~Y8_w*)1z6tAv-XVCsATs1#kn3T-2P9Ws&WgRVj-8mh z=;1@0IR46lj*%w-FB#u~vTo)Di_!m79uWvabIn_}nnU{a=X1mSQdt*z-ymVECGNEr zKdciTNG1QKkOZ=9;e38Rawpw=ZU^t_U)7Z)vW9(2xwE}?X81}3@=pLdp{dQ>DSo^? zK}`})_$09;%oVpiZN4^QIy=)#Ce1dRw)rv9Eh+Q2$aeniy)JHteBSA&y4v_c7pH|$ zLUk6Bq-WcQp~81G!%Kld!Hx+b7IZ(~eB%vKH47f%(@C%-Nj63kPD_79aVfNJX zYu1?6%a)k?@4cJnJfM4}J63C4V8pOH5A&oxi$E$nyYLan^sLiPc1>wz#mqUth$0CK zqXpvo_St9g9FRU5oaovB8db^w4jZ|G4P;jM-mx@r683Tqh)cEB$DZ+Tj*D@*gO>P^#&nAp{z|b-xx24)>Qh?kljuqFv+2`W_<-vT@)&mLAbN5r zNI>Hz{zZu{!eLlHbg6?35!*-CHV6$NyVbR|u805|6YKHeJ_!Rb+slD;_X%`#Y9C>D z>$n#uj{l|^G3;=XVqa@;Veq@`ySFO{u=nJKKfPqWb<#&%#0yX6@pdoY`j&-ghrO6B1o<=cpPE*94{U zxSpZB*Zqy_vqD2?eZq~XpLf$7pI~=YaCmROp54uc4I83dNVf4)1oAJ02D2$?*qILH zLx^rQ_!xR3(@cGpgU-9z>^|yNbN#QMGMh*^Da!q(c0mp#EA#26s&3tEjvqPP#e6{^ zMJ~Jo(m>cDGni`8 z1kw_leu~fxx{bT}crrs!K9qo6=ZeJ(Ij9aLq#(YY_UDr)PmE3AHPOGEfSYkrn?ny9 z_atC)Fs>wfnX=z%fE&fgq%o~Uq2>nJGm}sbdbON{BvFdBxAOG_@Nnp?6Ic0 zw16annP4Cs7+xAldo2(y0s%2BRN_Kip$i=$w%S#74B2qK$Jmt5000ffNkl`_$EtGJjR2uhj<_wMOJfZh}O)g8AoPvc~-n{&GJaV_3@ zYXe8rglm9x`0-^w;G8b((h&**fgq{9BUM-kL2>?dPwOdQy%3h0 zJNHJ8)($%U?pq^(5Cvk;eY;k&lo3Dw$z_+CkNn^|5YY5#S93sO zmrncffkyl~=sZ*TE}7Mrm_2irDe7G49#(7MVA#VjMZ6|aplZcFxR`Aee#fdCG_u)$ z`JR{umGTW>7;jPKjV3F9O5JzdG<_O(n0U=bFZ+7s%9SRrw-Ak_2m=!_r|7{4Sli#t z&j`b7>^kX%gqcYh6Di!G!??N>!xUYP07i~wyok@EloPRV`x=SYV*5AW{m#Fe_3NI^ zQMS^)0sakZcTjP#_e+cU!KQ(XW_541N34S*4!2V{-=8yd}=&UqsQ2eBNq5XU$ zox}Qv>br-2a}Qs`W5DO(XC~3K10KkDmOY2-g&~YM_ih|dQ^*_~J`bNee8{0@&a|l} zv#o*CphGh#zW2x>hxiWmOeC?JJO163Zx8#%;hb63t=QcoD5O9!2%Z5}u31lT>5>Ir zy*0&iMmhD1FFeP4A2~0)7v3R=j}5XQTzl`9qhP}V*8=~-!wqt}_?&vXc^f+9FjH-x zoeE##U1mw}@+p^^WNc)8T(4aO@-L5+X|(sl%kMSOOW|;}mR@n zq1p<@5TU7`-7tq8;TS6dx4&`A=Ir=uk2g2G9#vhfShmQ#{M_28$uLxoga>!y+wU-z zjBo-HtZR^;@SX%-<7fCCzU#fW-JNMT6lxpCosh9*>|@DHvV`o6Z7gGE>=~s<7!;0d zWhcu>mI#%lV@**GS%yI)qL?z_*pDsKGS+%0jTtlsnd7bZLs#cIAJ3Qf`Sg3P>wbRM z|GJ-V&;8+fm(>cAF#9To5CWL&?$6$jazAYc0#zRZ{oPzwdesbh5{9YRq_m1bntL<( zc#?m2CK@_aVIYRVuIG;sR%lCY4saXTj_I`W33s;ajSruU3$CJ*d? z|M@hJBQ?UQq%&#qk3D+GIRj84%lId7~E(Fu48 zaYzXS*ApvQXlqJCtT``$`?Y3Gfu#-Kv=Eg!z)v0OD2%FqJ-=Dgkf{RdI5=J(8YjPf zxRDKsW^hZZd`@k?m`kGsPFzIF_v4Sd8;R0s@~fbK4xk<(qtnO(jUwcpaITuvDmqwbQ;bR|7X2d z3-opDYVZ^H{aHJ_Sks1+z?fQw02iyb{m+SXrXm@NXrJtPEA>y2DNfG2D<95h*qnxz zQAA38GWz0>amH`M(*Tj?c8Avs{g)LKCurvMGMFmy4` z+iWAfFBG_@r%OYaXBL~D!u0C`>QU6myvZAxP-EZ>W1yJ)08V%j-`#U9UAZ6&Fe?}w z66Be8ai~`$&v7y&Vu4gWD{7@gNt!w@JtUc!;FIi42J*~~w+rXiZKAG>e_V#fc; z9GaVrE;=f14TI(3n&ssB5)!FSw_ol7(pAXG2-!=9Q(A+nw`|J{8Gb1D2JT2oS5Gb& zylztq`nXl{HGxxVN?0h#!YngmGZV}yZ~+k1hDv5thzo=q(?{KhYdKb&DH48Xle$TX z*X=(m6+K5Abi`bKw-UM9a!$$?y-a7b^_kwVR!Q@fguEPV^sB*k_=6lHquB5v`lG~%u{()R^*t|(9g4dE467A8F-e2xiNrwMhV?v+(C0c-B%}T(_0wT z%frhx-ufnuXMCAPyP8m9Qig3I5%rJE3eY%l*UHqyMHj;8PeCEwK6=_YQQZb#+$b?V z96m*l_-3bW#XPUcYPu#svZpEKv!AyWeZdf-hRMY{+8cB&anwUC(D;ZUUuS>&^y8`= zOohuJI6H1PexZW_mu@$jQWI0+<`VBN(>i0XRC*I1ls@VS>4+ts8x<$LhAK~lNG~^0 zb2-f~1q57HC_*&uVJ_lnwht<)(!N(>$o8R$g7Z`n*BcHG@l*+@3B|b2wBo&B#tGzB zoCide97Nf>ajA$w1B*^HlkN?#y|oE6JUpR950b@dSQ@r9kgeRmg5`ldwU1{@6Xw2L zAuP~M*2JjTQ=Kn3drnAMDJ`-!8Z(Eq!SI8VGQ(@YOcMU8xW!-s?N^wn91WJU1%`ZXE1T8 z#>l=zY%3-N@^%S4rO1v2?Sw`LyUlkzdFi zP|ohPg2+ZdSi6ijyO;5RMK4)FcbO`guz2HU=g{24B@(g`EktI9r~3?VPe5Axr48>& zF}>ofY`gB5+f~~uwhEy&W`m-EgUfUSttBn?%vf}UMfe{G`g=%vt7;zobTKn(akz4XP50oL=U2R zOnBvN@4!wec@Vd{isOX{tyB2^I`0>(3@x|NMpE43+5lrc@M^F}l2&0UqQ4(4H6ihf zb|fKRqWuj^U+NtI&%YEmVHB6M><~ng#}Wz>0dF{^ zuuUrMVmByOLaxW_Q+)D=?$%T`Ic z?UEgWaKxM7%vBD=?C<)V)nj!?Jl`J`@i18a;g8ef{_=WB!$xvvF<9F*hj|jn^V%H` z`QApDyTI+tjgxpvuSfV|)H?6t+SjY?I<=p|f`eYU)TfP4wDu!OX!Ma^G*zV13|k^P z@oyEN%GlL|DtC`&u?0|)KHe%EwhLQqR`APVQ>NJ~mj_F+qP2I*fHG|Xc~9ivhI_Zv z!dTr;Pf~r7+#>M$SJRmUeJ7m-2Gc^v1#n=breVj1OCFE{`4k=?%moK>315fo?+*Nz zk&u*q1|Wey@zwnTfIM)&82;_(k9^(YC&@nvze)Zl|5^B5@?HKn;rCR3Pxylb_yd1S r_%8{+_v#-K{#$+fzq}?2SduOD9to^l|24RRV}IGA9FdKd-YI_p&k~D$ literal 0 HcmV?d00001 diff --git a/projects/fangjia-open/src/main/webapp/static/images/xcxImage/bohaiyidai.jpg b/projects/fangjia-open/src/main/webapp/static/images/xcxImage/bohaiyidai.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b29b624702d670015d636a1f5d1bdef1e5ff0f85 GIT binary patch literal 17353 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 +<#compress> + + + + + + +娓ゆ捣鏄撹捶 + + + + + + + + + + + + +

+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl index ce65f946a..621633126 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl @@ -77,11 +77,7 @@ url : "../user/enterpriseLogin", data : { "username" : username, - "pass":pass, - "code":"${code!''}", - "sid":"${sid!''}", - "appId":"${appId!''}", - "appSecret":"${appSecret!''}" + "pass":pass }, success : function(result) { var re = $.parseJSON(result); From 3e7410cb7edb87d6339ec161aa5c20e78771b93e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 9 Jul 2021 15:53:24 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=AA=8C=E8=AF=81=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-open/src/main/webapp/8zeXpCrsCF.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 projects/fangjia-open/src/main/webapp/8zeXpCrsCF.txt diff --git a/projects/fangjia-open/src/main/webapp/8zeXpCrsCF.txt b/projects/fangjia-open/src/main/webapp/8zeXpCrsCF.txt new file mode 100644 index 000000000..47fa1c9b1 --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/8zeXpCrsCF.txt @@ -0,0 +1 @@ +374548aec5ca5d3cde89978570a9627c \ No newline at end of file From 1cdccf1b4b4f72ddeddf10654fc802798d5eab15 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 9 Jul 2021 17:08:32 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E6=BC=8F=E7=BD=91https?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl | 6 +++--- projects/fangjia-open/src/main/webapp/ccbRent/index.ftl | 4 ++-- projects/fangjia-open/src/main/webapp/ccbRent/report.ftl | 4 ++-- projects/fangjia-open/src/main/webapp/layout/footer.ftl | 4 ++-- projects/fangjia-open/src/main/webapp/news/content.ftl | 4 ++-- projects/fangjia-open/src/main/webapp/news/index.ftl | 4 ++-- .../fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl index 05d0776a0..e606e1324 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl @@ -183,10 +183,10 @@ - - + + - + diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl index 60f3ac58f..92863c38f 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl @@ -152,8 +152,8 @@ - - + + diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl index 9085c3fc6..84263ce86 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/report.ftl @@ -50,8 +50,8 @@ - - + + + - + diff --git a/projects/fangjia-open/src/main/webapp/news/content.ftl b/projects/fangjia-open/src/main/webapp/news/content.ftl index 674fc9875..15d320da5 100644 --- a/projects/fangjia-open/src/main/webapp/news/content.ftl +++ b/projects/fangjia-open/src/main/webapp/news/content.ftl @@ -35,8 +35,8 @@ - - + + diff --git a/projects/fangjia-open/src/main/webapp/news/index.ftl b/projects/fangjia-open/src/main/webapp/news/index.ftl index bdf1d0eef..cc402fa34 100644 --- a/projects/fangjia-open/src/main/webapp/news/index.ftl +++ b/projects/fangjia-open/src/main/webapp/news/index.ftl @@ -59,8 +59,8 @@ - - + + - + +