Merge remote-tracking branch 'origin/master'

This commit is contained in:
2023-02-02 12:42:42 +08:00
@@ -27,6 +27,8 @@ class BigdataCitypriceBatch extends BaseBatch{
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80)
def curRunDate = 202212//DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
static main(args) {
runBatch(new BigdataCitypriceBatch(), args)
}
@@ -34,8 +36,8 @@ class BigdataCitypriceBatch extends BaseBatch{
@Override
void process(Object args) {
def citys = CcbCommonUtils.getRunningCitys(args)
def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
def startDate = 20221201//DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
def endDate = 20221231//DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
cityRun(citys, startDate, endDate, cityCodeDataMap)
@@ -238,7 +240,7 @@ class BigdataCitypriceBatch extends BaseBatch{
if (sell_avg_price || rent_avg_price) {
def row = []
row << cityCodeDataMap.get(dist.city)
row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
row << curRunDate//DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
row << dist._id.toString()
if (sell_avg_price) {
@@ -362,7 +364,7 @@ class BigdataCitypriceBatch extends BaseBatch{
if (sell_avg_price || rent_avg_price) {
def row = []
row << cityCodeDataMap.get(city)
row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
row << curRunDate//DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
if(region){
row << regionCodeDataMap.district_code