Merge branch 'script_gj' into 'master'

成交数据去除价格过滤,因为还没有计算,无价格

See merge request !874
This commit is contained in:
2024-06-30 16:44:14 +08:00
@@ -5,28 +5,19 @@ import com.fangjia.core.util.DataUtil
import com.fangjia.script.BaseBatch import com.fangjia.script.BaseBatch
import com.fangjia.script.BatchOwner import com.fangjia.script.BatchOwner
import com.fangjia.script.Watcher import com.fangjia.script.Watcher
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.gj.ccb.CcbCodeUtils import com.fangjia.script.gj.ccb.CcbCodeUtils
import com.fangjia.script.gj.ccb.FileUtils
import com.fangjia.script.gj.district.SeaweedDataMatchProcess import com.fangjia.script.gj.district.SeaweedDataMatchProcess
import com.fangjia.script.util.DateUtils import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.MongoUtils import com.fangjia.script.util.MongoUtils
import com.fangjia.script.util.OpenApiClient import com.fangjia.script.util.OpenApiClient
import com.mongodb.BasicDBObject import com.mongodb.BasicDBObject
import com.mongodb.DBCollection import com.mongodb.DBCollection
import com.rabbitmq.client.impl.AMQImpl
import groovy.sql.Sql import groovy.sql.Sql
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.*
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.AtomicInteger
import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.atomic.AtomicLong
import java.util.regex.Pattern import java.util.regex.Pattern
/** /**
* 建行模型估值项目 * 建行模型估值项目
* 成交数据同步 * 成交数据同步
@@ -130,7 +121,7 @@ class FjwBigdataDealBatch extends BaseBatch{
def ccbPriceMap = null def ccbPriceMap = null
if(city == "上海"){ if(city == "上海"){
ccbPriceMap = getCommunityPrices("上海") ccbPriceMap = [:]//getCommunityPrices("上海")
} }
for(def i=0;i<rets.size();i++){ for(def i=0;i<rets.size();i++){
@@ -176,6 +167,19 @@ class FjwBigdataDealBatch extends BaseBatch{
def getCommunityPrices(def city){
def sql = "select commid, avg_price from community_base_price where year_month=${endDate} and cityname='${city}'";
def map = [:]
try{
sqlInstance.eachRow(sql,{
map.put(it.commid, it.avg_price)
});
}catch(Exception e){
//getPpeGTE15Datas(city)
}
return map
}
def findThirdPartyPrice(def city) { def findThirdPartyPrice(def city) {
def q = new BasicDBObject() def q = new BasicDBObject()