diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy index 710eeacca..f44d8bf4b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/UpdateDistrictField.groovy @@ -52,7 +52,8 @@ class UpdateDistrictField extends BaseBatch{ } } def margeResults = megerDatas(sourceMap) -// updateDB(margeResults) + updateDB(margeResults) + println "修改完成 "+new Date().toString() } def megerDatas(sourceMap){ @@ -101,74 +102,74 @@ class UpdateDistrictField extends BaseBatch{ } - def margeValue(lianjiaMap, wiwjMap, anjukeMap){ - def lianjisIds = lianjiaMap.keySet() - def wiwjIds = wiwjMap.keySet() - def anjukeIds = anjukeMap.keySet() - def set = new HashSet() - set.addAll(lianjisIds) - set.addAll(wiwjIds) - set.addAll(anjukeIds) - - def lastValues = [] - def lianjiaUpdateCount = 0 - def wiwjUpdateCount = 0 - def anjukeUpdateCount = 0 - def lianjiaCountMap = [:] - def wiwjCountMap = [:] - def anjukeCountMap = [:] - set.each {id-> - BasicDBObject newValMap = new BasicDBObject() - fields.each {field-> - def lianjiaValMap = lianjiaMap.get(id) - def wiwjValMap = wiwjMap.get(id) - def anjukeValMap = anjukeMap.get(id) - if(lianjiaValMap && lianjiaValMap.containsKey(field)){ - newValMap.put(field, lianjiaValMap.get(field)) - lianjiaUpdateCount++ - def count = lianjiaCountMap.get(field) - if(!count){ - lianjiaCountMap.put(field, 1) - }else{ - lianjiaCountMap.put(field, count + 1) - } - }else if(wiwjValMap && wiwjValMap.containsKey(field)){ - newValMap.put(field, wiwjValMap.get(field)) - wiwjUpdateCount++ - def count = wiwjCountMap.get(field) - if(!count){ - wiwjCountMap.put(field, 1) - }else{ - wiwjCountMap.put(field, count + 1) - } - }else if(anjukeValMap && anjukeValMap.containsKey(field)){ - newValMap.put(field, anjukeValMap.get(field)) - anjukeUpdateCount++ - def count = anjukeCountMap.get(field) - if(!count){ - anjukeCountMap.put(field, 1) - }else{ - anjukeCountMap.put(field, count + 1) - } - } - } - newValMap.put("id", id) - lastValues << newValMap - } - - lianjiaCountMap.each {k,v-> - println "[链家] "+k+" "+v - } - - wiwjCountMap.each {k,v-> - println "[我爱我家] "+k+" "+v - } - - anjukeCountMap.each {k,v-> - println "[安居客] "+k+" "+v - } - return lastValues - } +// def margeValue(lianjiaMap, wiwjMap, anjukeMap){ +// def lianjisIds = lianjiaMap.keySet() +// def wiwjIds = wiwjMap.keySet() +// def anjukeIds = anjukeMap.keySet() +// def set = new HashSet() +// set.addAll(lianjisIds) +// set.addAll(wiwjIds) +// set.addAll(anjukeIds) +// +// def lastValues = [] +// def lianjiaUpdateCount = 0 +// def wiwjUpdateCount = 0 +// def anjukeUpdateCount = 0 +// def lianjiaCountMap = [:] +// def wiwjCountMap = [:] +// def anjukeCountMap = [:] +// set.each {id-> +// BasicDBObject newValMap = new BasicDBObject() +// fields.each {field-> +// def lianjiaValMap = lianjiaMap.get(id) +// def wiwjValMap = wiwjMap.get(id) +// def anjukeValMap = anjukeMap.get(id) +// if(lianjiaValMap && lianjiaValMap.containsKey(field)){ +// newValMap.put(field, lianjiaValMap.get(field)) +// lianjiaUpdateCount++ +// def count = lianjiaCountMap.get(field) +// if(!count){ +// lianjiaCountMap.put(field, 1) +// }else{ +// lianjiaCountMap.put(field, count + 1) +// } +// }else if(wiwjValMap && wiwjValMap.containsKey(field)){ +// newValMap.put(field, wiwjValMap.get(field)) +// wiwjUpdateCount++ +// def count = wiwjCountMap.get(field) +// if(!count){ +// wiwjCountMap.put(field, 1) +// }else{ +// wiwjCountMap.put(field, count + 1) +// } +// }else if(anjukeValMap && anjukeValMap.containsKey(field)){ +// newValMap.put(field, anjukeValMap.get(field)) +// anjukeUpdateCount++ +// def count = anjukeCountMap.get(field) +// if(!count){ +// anjukeCountMap.put(field, 1) +// }else{ +// anjukeCountMap.put(field, count + 1) +// } +// } +// } +// newValMap.put("id", id) +// lastValues << newValMap +// } +// +// lianjiaCountMap.each {k,v-> +// println "[链家] "+k+" "+v +// } +// +// wiwjCountMap.each {k,v-> +// println "[我爱我家] "+k+" "+v +// } +// +// anjukeCountMap.each {k,v-> +// println "[安居客] "+k+" "+v +// } +// return lastValues +// } def updateDB(margeResults){ for(def mr : margeResults){ @@ -179,57 +180,57 @@ class UpdateDistrictField extends BaseBatch{ } } - def batchUpdateDist(source){ -// def rets = findThirdMatchDist(source) - println "[${source}] 符保条件小区量:"+rets.size() - def updateIndex = new AtomicLong() - final CountDownLatch latch = new CountDownLatch(rets.size()) - def allUpdateList = new CopyOnWriteArrayList() - - def sourceMap = new ConcurrentHashMap() - - for(def i=0;i - def count = countMap.get(k) - if(!count){ - countMap.put(k, 1) - }else{ - countMap.put(k, count+1) - } - } - } - - countMap.each {k,v-> - println k +" 更新量:"+v - } - - println "---------------------------------------------------------" - return sourceMap - } +// def batchUpdateDist(source){ +//// def rets = findThirdMatchDist(source) +// println "[${source}] 符保条件小区量:"+rets.size() +// def updateIndex = new AtomicLong() +// final CountDownLatch latch = new CountDownLatch(rets.size()) +// def allUpdateList = new CopyOnWriteArrayList() +// +// def sourceMap = new ConcurrentHashMap() +// +// for(def i=0;i +// def count = countMap.get(k) +// if(!count){ +// countMap.put(k, 1) +// }else{ +// countMap.put(k, count+1) +// } +// } +// } +// +// countMap.each {k,v-> +// println k +" 更新量:"+v +// } +// +// println "---------------------------------------------------------" +// return sourceMap +// } def running(url, old_match_id){ def esObj = findCommunities(url) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy index 60824f8d5..4c710cb47 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/images/AddDistImagesBatch.groovy @@ -38,7 +38,7 @@ class AddDistImagesBatch extends BaseBatch{ @Override public void process(Object args) { - def mdate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1), "yyyy-MM-dd") + def mdate = DateUtils.getFirstDayOfMonth(new Date(), -1) // def mdate = DateUtils.getFirstDayOfMonth(new Date(), -1) def citys = CommonUtils.findAllCity() citys.each {city-> @@ -48,7 +48,7 @@ class AddDistImagesBatch extends BaseBatch{ matchCommunitys(communitys) } -// statImgCount() + statImgCount() } def findAllEsData2(city, mdate){ QueryBuilder date_range = QueryBuilders.rangeQuery("m_date").from(mdate.getTime()).includeLower(true) @@ -105,40 +105,47 @@ class AddDistImagesBatch extends BaseBatch{ def total = communitys.size() for(def i=0;i