Merge branch 'script_gj' into 'master'

修改

See merge request !1018
This commit is contained in:
2024-11-25 13:32:23 +08:00
2 changed files with 33 additions and 9 deletions
@@ -10,12 +10,10 @@ import com.fangjia.script.gj.ccb.CcbCodeUtils
import com.fangjia.script.gj.ccb.FileUtils 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 org.bson.types.ObjectId import org.bson.types.ObjectId
@@ -23,11 +21,9 @@ import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch
import java.util.concurrent.ExecutorService import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors 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
/** /**
* 建行模型估值项目 * 建行模型估值项目
* 成交数据同步 * 成交数据同步
@@ -71,11 +67,11 @@ class BigdataDealBatch extends BaseBatch{
def citys = CcbCommonUtils.getRunningCitys(args) def citys = CcbCommonUtils.getRunningCitys(args)
println "curDate:"+curDate println "curDate:"+curDate
// def allCitys = CommonDatautils.findAllCity() def allCitys = CommonDatautils.findAllCity()
// for(def city : allCitys){ for(def city : allCitys){
// addDealPriceMatch(city); addDealPriceMatch(city);
// } }
// updateCrawlTradeDate()//修改后抓取的成交,将时间改为本月 updateCrawlTradeDate()//修改后抓取的成交,将时间改为本月
def rows = [] def rows = []
@@ -4208,6 +4208,19 @@ class CommonDatautils {
} }
static def findAllNewPoiDatas(city){
String sql = "select cityname,adname,name,address,location from poi_amap_2024 where cityname='${city}'"
def rets = [:]
def index= 0
ElasticUtils.executeSqlQuery(sql, { map->
index++
println index
rets << ["map_id":map.id,"city":map.cityname, "district":map.adname, "name":map.name, "address":map.address, "type":map.type,"lng":map.location.x, "lat":map.location.y]
})
return rets;
}
static def findOneThirdNetWorkOffice(city, region, name){ static def findOneThirdNetWorkOffice(city, region, name){
String sql = "select location from office where city='${city}' and region='${region}' and name='${name}'" String sql = "select location from office where city='${city}' and region='${region}' and name='${name}'"
def map = [:] def map = [:]
@@ -4903,6 +4916,21 @@ class CommonDatautils {
return cityMap return cityMap
} }
static def findFullNameCitys(){
def q = new BasicDBObject()
q.put("type","城市")
def keys = new BasicDBObject()
keys.put("city", 1)
keys.put("province", 1)
def dbcursor = ADMINISTRATIVE_MAPPING_COLL.find(q, keys)
def cityList = []
for(def d : dbcursor){
cityList << d
}
return cityList
}
static def queryDistNameByCity(){ static def queryDistNameByCity(){
def q = new BasicDBObject() def q = new BasicDBObject()