Merge branch 'script_gj' into 'master'

update

See merge request !691
This commit is contained in:
2023-07-20 17:41:18 +08:00
2 changed files with 9 additions and 6 deletions
@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.CountDownLatch
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicLong
import java.util.regex.Pattern
@@ -84,6 +85,7 @@ class BigdataDealBatch extends BaseBatch{
def ppeDists = [:]
def dealIds = findHistoryDealIds(city)
println "历史id加载量:"+dealIds.size()
def statMap = [:]//getDistrictStatByCity(city, weekend)
if(city=="上海"){
def youDataTrade = getYouDaData(statMap)
@@ -129,7 +131,7 @@ class BigdataDealBatch extends BaseBatch{
for(def i=0;i<rets.size();i++){
final def trade = rets[i]
if(dealIds.contains(trade._id.toString())){
println trade._id.toString()
println "重复:"+trade._id.toString() + " "+ trade.district_name
continue
}
fixedThreadPool.execute(new Runnable() {
@@ -160,7 +162,8 @@ class BigdataDealBatch extends BaseBatch{
};
})
}
latch.await()
println "查询完成......."
latch.await(5, TimeUnit.MINUTES);
return result
}
@@ -71,11 +71,11 @@ class OfficeFieldCleanBatch extends BaseBatch{
// addBlock()
addFieldValue()
// addFieldValue()
// updateErrorField()
// export()
// test()
export()
test()
// addOffice()
}
@@ -120,7 +120,7 @@ class OfficeFieldCleanBatch extends BaseBatch{
}
def test(){
def datas = ExcelUtils.read("D:\\数据\\写字楼\\写字楼价格 (2).xlsx",0 , 1)
def datas = ExcelUtils.read("D:\\数据\\写字楼\\写字楼价格(1).xlsx",0 , 1)
def map = [:]
for(def d : datas){
map.put(d['A']+"#"+d['B']+'#'+d['C'], d)