Merge branch 'script_gj' into 'master'

时间

See merge request !593
This commit is contained in:
2023-04-08 14:47:06 +08:00
@@ -60,9 +60,9 @@ class BigdataCitypriceBatch extends BaseBatch{
def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(curDate,-1), "yyyyMMdd").toInteger(); def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(curDate,-1), "yyyyMMdd").toInteger();
def dealStartDate = DateUtils.addMonth(DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd"), -1) def dealStartDate = DateUtils.addMonth(DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd"), -1)
def lastYearDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-12), "yyyyMMdd").toInteger(); def lastYearDate = DateUtils.addMonth(startDate.toString(),-12, "yyyyMMdd").toInteger();
// cityRun(citys, startDate, endDate, cityCodeDataMap) // cityRun(citys, startDate, endDate, cityCodeMap)
// regionRun(citys, startDate, endDate, cityCodeDataMap) // regionRun(citys, startDate, endDate, cityCodeMap)
districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap)
} }
@@ -271,6 +271,7 @@ class BigdataCitypriceBatch extends BaseBatch{
def rets = new CopyOnWriteArrayList() def rets = new CopyOnWriteArrayList()
for(def i=0;i<districts.size();i++){ for(def i=0;i<districts.size();i++){
final def dist = districts[i]; final def dist = districts[i];
fixedThreadPool.execute(new Runnable() { fixedThreadPool.execute(new Runnable() {
void run() { void run() {
try { try {