Merge branch 'script_gj' into 'master'

update bug

See merge request !693
This commit is contained in:
2023-07-20 18:12:38 +08:00
@@ -134,30 +134,29 @@ 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() + " "+ trade.district_name
continue
}
fixedThreadPool.execute(new Runnable() {
void run() {
try {
totalCount.addAndGet(1)
if(source == "youda"){
def ret = converYouDaData(trade, cityCodeDatas, distCodeMap, ccbPriceMap)
if(ret){
result << ret
println totalCount.get() +" 友达:"+trade.city+" "+trade.region+" "+trade.fjName+" "+new Date().toLocaleString()
}
if(dealIds.contains(trade._id.toString())){
println "重复:"+trade._id.toString() + " "+ trade.district_name
}else{
def ret = converData(trade, cityCodeDatas, distCodeMap)
if(ret){
result << ret
println totalCount.get() +" 第三方:"+trade.city+" "+trade.region+" "+trade.district_name+" "+new Date().toLocaleString()
if(source == "youda"){
def ret = converYouDaData(trade, cityCodeDatas, distCodeMap, ccbPriceMap)
if(ret){
result << ret
println totalCount.get() +" 友达:"+trade.city+" "+trade.region+" "+trade.fjName+" "+new Date().toLocaleString()
}
}else{
def ret = converData(trade, cityCodeDatas, distCodeMap)
if(ret){
result << ret
println totalCount.get() +" 第三方:"+trade.city+" "+trade.region+" "+trade.district_name+" "+new Date().toLocaleString()
}
}
}
} catch (Exception e) {
e.printStackTrace()
} finally {