Merge branch 'script_gj' into 'master'

update

See merge request !319
This commit is contained in:
2022-05-27 14:40:09 +08:00
@@ -112,15 +112,16 @@ class TradeExportBatch extends BaseBatch{
// q.put("trade_date", new BasicDBObject(QueryOperators.LT, endDate))
def cursor = DEAL_PRICE.find(q).addOption(Bytes.QUERYOPTION_NOTIMEOUT).batchSize(1000);
def rets = []
def urls = []
def keys = []
if (cursor != null) {
while (cursor.hasNext()) {
DBObject dbo = cursor.next();
def district = districtMap.get(dbo.city + "_" + dbo.region + "_" + dbo.district_name);
if(district){
if(!urls.contains(dbo.url)){
urls << dbo.url
def tradeDateStr = DateUtils.formatDateByPattern(dbo.trade_date, "yyyy-MM-dd")
def key = district._id.toString() +"##" + dbo.avg_price +"##"+dbo.area+"##"+tradeDateStr
if(!keys.contains(key)){
keys << key
def ret = [];
ret << dbo._id.toString()
ret << district._id.toString()
@@ -129,7 +130,7 @@ class TradeExportBatch extends BaseBatch{
ret << dbo.district_name
ret << dbo.avg_price
ret << dbo.area
ret << DateUtils.formatDateByPattern(dbo.trade_date, "yyyy-MM-dd")
ret << tradeDateStr
ret << dbo.total_price
rets << ret;
}