人工指导价修改
This commit is contained in:
+13
@@ -7,12 +7,16 @@ import com.fangjia.script.lixue.util.DBUtils
|
|||||||
import com.fangjia.script.util.DataUtil
|
import com.fangjia.script.util.DataUtil
|
||||||
import com.fangjia.script.util.DateUtils
|
import com.fangjia.script.util.DateUtils
|
||||||
import com.fangjia.script.util.MongoUtils
|
import com.fangjia.script.util.MongoUtils
|
||||||
|
import com.google.common.hash.BloomFilter
|
||||||
|
import com.google.common.hash.Funnels
|
||||||
import com.mongodb.BasicDBObject
|
import com.mongodb.BasicDBObject
|
||||||
import com.mongodb.DBCollection
|
import com.mongodb.DBCollection
|
||||||
import com.mongodb.DBObject
|
import com.mongodb.DBObject
|
||||||
import com.rabbitmq.client.impl.AMQImpl
|
import com.rabbitmq.client.impl.AMQImpl
|
||||||
import groovy.sql.Sql
|
import groovy.sql.Sql
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets
|
||||||
|
|
||||||
class CcbCommonUtils {
|
class CcbCommonUtils {
|
||||||
|
|
||||||
|
|
||||||
@@ -684,6 +688,15 @@ class CcbCommonUtils {
|
|||||||
pgsqlInstance.executeUpdate(sql2)
|
pgsqlInstance.executeUpdate(sql2)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static def findGuiDingIdsByCity(){
|
||||||
|
// 创建布隆过滤器对象
|
||||||
|
BloomFilter<CharSequence> filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001);
|
||||||
|
pgsqlInstance.eachRow("SELECT gujia_fsid FROM base.t0831_guided_price_gj_h",{it->
|
||||||
|
filter.put(it.gujia_fsid)
|
||||||
|
});
|
||||||
|
return filter
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static def findDistGovPrice(def city){
|
public static def findDistGovPrice(def city){
|
||||||
def ids = []
|
def ids = []
|
||||||
|
|||||||
+16
-3
@@ -47,16 +47,22 @@ class GuiDingPriceBatch extends BaseBatch{
|
|||||||
def rows = []
|
def rows = []
|
||||||
|
|
||||||
CcbCommonUtils.deleteGuidedPrice(curDate)
|
CcbCommonUtils.deleteGuidedPrice(curDate)
|
||||||
|
|
||||||
|
def priceIdsfilter = CcbCommonUtils.findGuiDingIdsByCity()
|
||||||
for (def city : citys) {
|
for (def city : citys) {
|
||||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||||
|
|
||||||
//添加自己库中的人工指导价
|
//添加自己库中的人工指导价
|
||||||
def prices = CcbCommonUtils.findPersonPrice(city, "2024-05-24", "2024-06-27")
|
// def prices = CcbCommonUtils.findPersonPrice(city, "2024-05-24", "2024-06-27")
|
||||||
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
||||||
|
//近3个月人工指导价
|
||||||
|
def end = DateUtils.add(DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd"), 1)
|
||||||
|
def start = DateUtils.add(DateUtils.formatDateByPattern(new Date(),"yyyy-MM-dd"), -90)
|
||||||
|
def prices = CcbCommonUtils.findPersonPrice(city, start, end)
|
||||||
if(prices){
|
if(prices){
|
||||||
def distMap = getDistrictMap(city)
|
def distMap = getDistrictMap(city)
|
||||||
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)
|
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices, priceIdsfilter)
|
||||||
rows.addAll(rets)
|
rows.addAll(rets)
|
||||||
println city + " " + rets.size()
|
println city + " " + rets.size()
|
||||||
}
|
}
|
||||||
@@ -142,11 +148,18 @@ class GuiDingPriceBatch extends BaseBatch{
|
|||||||
return obj
|
return obj
|
||||||
}
|
}
|
||||||
|
|
||||||
def createCityDatas(cityCodeDatas, distCodeMap, distMap, prices){
|
def createCityDatas(cityCodeDatas, distCodeMap, distMap, prices, priceIdsfilter){
|
||||||
def rets = []
|
def rets = []
|
||||||
if(prices){
|
if(prices){
|
||||||
for(def ps : prices){
|
for(def ps : prices){
|
||||||
|
|
||||||
def dist = distMap.get(ps.region+"##"+ps.name)
|
def dist = distMap.get(ps.region+"##"+ps.name)
|
||||||
|
|
||||||
|
if(priceIdsfilter.mightContain(ps._id.toString())){
|
||||||
|
println ps._id.toString() +ps.region+"##"+ps.name+" 已存在"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
if(dist){
|
if(dist){
|
||||||
def ret = []
|
def ret = []
|
||||||
def areaData = distCodeMap.get(dist.region)
|
def areaData = distCodeMap.get(dist.region)
|
||||||
|
|||||||
@@ -156,6 +156,22 @@ public class ProvinceData {
|
|||||||
return PROVINCE_MAP.get(province);
|
return PROVINCE_MAP.get(province);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static String getSimpleProvince(String province){
|
||||||
|
def prov = null
|
||||||
|
def newDatas = data + GOVERNMENT_CITY_LIST
|
||||||
|
for(def key : newDatas.keySet()){
|
||||||
|
def list = newDatas.get(key)
|
||||||
|
list << key
|
||||||
|
if(list.contains(province)){
|
||||||
|
prov = key
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return prov;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取省份下的所有城市
|
* 获取省份下的所有城市
|
||||||
* @param province
|
* @param province
|
||||||
|
|||||||
Reference in New Issue
Block a user