Merge branch 'script_gj' into 'master'

第三方

See merge request !1014
This commit is contained in:
2024-11-22 11:09:25 +08:00
@@ -40,9 +40,9 @@ class ThirdPriceMappingBatch extends BaseBatch{
@Override
public void process(Object args) {
// //将新增数据同步过来
addNemCommunity()
// //接口进行匹配
match()
// addNemCommunity()
//// //接口进行匹配
// match()
addOldMatchResult()
}
@@ -177,6 +177,10 @@ class ThirdPriceMappingBatch extends BaseBatch{
def citys = CommonUtils.findAllCity()
def keys = new BasicDBObject()
keys.put("_id", 1)
keys.put("city", 1)
keys.put("district", 1)
keys.put("name", 1)
keys.put("source", 1)
for(def c : citys){
def datas = thirdSeaweedMappingColl.find(new BasicDBObject("city", c).append("old_match_id", new BasicDBObject('$exists', false)), keys).toList()
@@ -196,8 +200,13 @@ class ThirdPriceMappingBatch extends BaseBatch{
void run() {
try{
addCount.addAndGet(1)
def query = new BasicDBObject().append("s_date", curDate).append("city", city).append("tid", d._id.toString())
def obj = dataProcessColl.findOne(query)
//.append("s_date", curDate)
def query = new BasicDBObject().append("city", city).append("region",d.district).append("name", d.name).append("source",d.source)
def objs = dataProcessColl.find(query).sort(new BasicDBObject("s_date",-1)).limit(1)
def obj = null
if(objs){
obj = objs[0]
}
if(obj) {
def dist = CommonDatautils.findDistrict(obj.match_city, obj.match_region, obj.match_name, "district")
def udata = new BasicDBObject()