Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj

This commit is contained in:
2025-09-12 11:29:01 +08:00
@@ -1,18 +1,14 @@
package com.fangjia.script.fuzhou
import com.fangjia.core.RegionData
import com.fangjia.core.util.DataUtil
import com.fangjia.script.BaseBatch
import com.fangjia.script.BatchOwner
import com.fangjia.script.Watcher
import com.fangjia.script.util.CommonUtils
import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.DbUtils
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.MongoUtils
import com.mongodb.BasicDBObject
import com.mongodb.DBCollection
import com.mongodb.QueryOperators
import java.text.DecimalFormat
import java.util.concurrent.CopyOnWriteArrayList
@@ -20,8 +16,6 @@ import java.util.concurrent.CountDownLatch
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicLong
import java.util.regex.Pattern
//小区月度均价表(带涨跌幅控制)
@BatchOwner(Watcher.GaoJuan)
class DistrictSellStatBatch extends BaseBatch {
@@ -75,7 +69,7 @@ class DistrictSellStatBatch extends BaseBatch {
if(!curDate){
curDate = new Date()
}
def citys = ["福州"]//CommonUtils.findAllCity()
def citys = CommonUtils.findAllCity()
def keys = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("estate_type2", 1).append("status", 1)
def lastMonthWeekend = DateUtils.truncateDay(DateUtils.getLastSundayInWeekOfLastMonth(curDate))
@@ -95,7 +89,7 @@ class DistrictSellStatBatch extends BaseBatch {
index++
def districts = []
if(city == "福州"){
if(day == 12){
if(day == 2){
districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList()
}else{
districts = FZ_DIST_COLL.find(new BasicDBObject("city", city).append("m_date", new BasicDBObject('$gte',startMDate).append('$lt', endMDate)), keys).toList()
@@ -104,7 +98,7 @@ class DistrictSellStatBatch extends BaseBatch {
def q = new BasicDBObject("city", city).append("cat", "district").append("status", 0)
// q.put("name", "翠园楼")
if(day == 2){
districts = SEAWEED_MONGO_COLL.find(q, keys).batchSize(2000)
districts = SEAWEED_MONGO_COLL.find(q, keys).batchSize(2000).toList()
}else{
q.put("m_date", new BasicDBObject('$gte',startMDate).append('$lt', endMDate))
districts = SEAWEED_MONGO_COLL.find(q, keys).batchSize(2000)
@@ -155,6 +149,7 @@ class DistrictSellStatBatch extends BaseBatch {
def dist = districts[i]
fixedThreadPool.execute(new Runnable() {
void run() {
try {
totalCount.addAndGet(1)
def key = dist.region +"##" + dist.name
@@ -248,6 +243,7 @@ class DistrictSellStatBatch extends BaseBatch {
} catch (Exception e) {
e.printStackTrace()
} finally {
latch.countDown()
}