Merge branch 'script_gj' into 'master'

人工指导价修改

See merge request !878
This commit is contained in:
2024-07-02 14:42:37 +08:00
3 changed files with 45 additions and 3 deletions
@@ -7,12 +7,16 @@ import com.fangjia.script.lixue.util.DBUtils
import com.fangjia.script.util.DataUtil
import com.fangjia.script.util.DateUtils
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.DBCollection
import com.mongodb.DBObject
import com.rabbitmq.client.impl.AMQImpl
import groovy.sql.Sql
import java.nio.charset.StandardCharsets
class CcbCommonUtils {
@@ -684,6 +688,15 @@ class CcbCommonUtils {
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){
def ids = []
@@ -47,16 +47,22 @@ class GuiDingPriceBatch extends BaseBatch{
def rows = []
CcbCommonUtils.deleteGuidedPrice(curDate)
def priceIdsfilter = CcbCommonUtils.findGuiDingIdsByCity()
for (def city : citys) {
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
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")
//近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){
def distMap = getDistrictMap(city)
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices, priceIdsfilter)
rows.addAll(rets)
println city + " " + rets.size()
}
@@ -142,11 +148,18 @@ class GuiDingPriceBatch extends BaseBatch{
return obj
}
def createCityDatas(cityCodeDatas, distCodeMap, distMap, prices){
def createCityDatas(cityCodeDatas, distCodeMap, distMap, prices, priceIdsfilter){
def rets = []
if(prices){
for(def ps : prices){
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){
def ret = []
def areaData = distCodeMap.get(dist.region)
@@ -156,6 +156,22 @@ public class ProvinceData {
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