Merge branch 'script_gj' into 'master'

去多线程测试

See merge request !1033
This commit is contained in:
2024-12-17 10:15:34 +08:00
@@ -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.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1), "yyyy-MM-dd")
def mdate = DateUtils.getFirstDayOfMonth(new Date(), -1)
def citys = CommonUtils.findAllCity()
citys.each {city->
@@ -47,10 +47,9 @@ class AddDistImagesBatch extends BaseBatch{
//第三方匹配小区
matchCommunitys(communitys)
}
// statImgCount()
}
def findAllEsData2(city, mdate){
QueryBuilder date_range = QueryBuilders.rangeQuery("m_date").from(mdate.getTime()).includeLower(true)
@@ -106,8 +105,8 @@ class AddDistImagesBatch extends BaseBatch{
def total = communitys.size()
for(def i=0;i<communitys.size();i++){
final def d = communitys[i]
fixedThreadPool.execute(new Runnable() {
void run() {
// fixedThreadPool.execute(new Runnable() {
// void run() {
try{
addCount.addAndGet(1)
def query = new BasicDBObject("city", d.city).append("district",d.region).append("name",d.name).append("source","安居客").append("match_id", new BasicDBObject('$exists', true))
@@ -136,11 +135,32 @@ class AddDistImagesBatch extends BaseBatch{
} finally {
latch.countDown()
}
}
});
// }
// });
}
latch.await()
// latch.await()
return rets
}
def statImgCount(){
def q = new BasicDBObject()
def dbcursor = seaweed_fs_coll.find(q)
def out_pics_count = 0
def floor_count = 0
for(def d : dbcursor){
if(d.out_pics){
out_pics_count = out_pics_count + d.out_pics.size()
}
if(d.floorplan_pics){
d.floorplan_pics.each{k,v->
floor_count = floor_count + v.size()
}
}
}
println out_pics_count
println floor_count
}
}