diff --git a/projects/fangjia-coresite/pom.xml b/projects/fangjia-coresite/pom.xml
index 05fa7f275..72cefc4b9 100644
--- a/projects/fangjia-coresite/pom.xml
+++ b/projects/fangjia-coresite/pom.xml
@@ -242,5 +242,13 @@
1.0.0
jdk18
+
+
+
+
+
+
+
+
diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl
index 323aeb051..b1a1c4956 100644
--- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl
@@ -38,7 +38,9 @@
行业动�
数�分�
�功案例
- 公�动�
+ �路客
+ 房价通
+ 地数
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy
index fed4c92bd..06e78b250 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy
@@ -25,29 +25,29 @@ class ExportOracleData {
def run(args) {
citys = CcbCommonUtils.getRunningCitys(args)
-// def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
+ def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM")
def new_dists = []
//²»»á±ä
- exportEvaluationRateData()
- exportBigdataPoiData()//
- exportBigdataDistrictData()//
+// exportEvaluationRateData()
+// exportBigdataPoiData()//
+// exportBigdataDistrictData()//
+//
+// exportGuidedPrice()//ËæÈ˹¤¸Ä±ä//
+// exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß//
+//
+//// //´¦ÀíÐ¡ÇøÇé¿ö
+// exportBigdataCommunity()//
+// exportCommunityStaging()//ûcityid
+// exportCommunityBuileType()//
- exportGuidedPrice()//ËæÈ˹¤¸Ä±ä//
- exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß//
-
-// //´¦ÀíÐ¡ÇøÇé¿ö
- exportBigdataCommunity()//
- exportCommunityStaging()//ûcityid
- exportCommunityBuileType()//
-
- exportThirdPartyPrice2(lastMonth, new_dists)//
- exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19
+// exportThirdPartyPrice2(lastMonth, new_dists)//
+// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19
exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01
//µÚÈý·½ÍøÕ¾È¨Öرí
- exportWebsiteRate();
+// exportWebsiteRate();
//¼ÆËã½á¹ûÏà¹Ø
@@ -63,11 +63,11 @@ class ExportOracleData {
// exportCommunityPdescribeGj(curMonth)
// exportCommCaseDetailGj(curMonth)
-// def curDate = curMonth.toString()+"28"
-// SSHHelper jschCommand = new SSHHelper();
-// System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
+ def curDate = curMonth.toString()+"28"
+ SSHHelper jschCommand = new SSHHelper();
+ System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
//okÎļþ
-// exportLastFile()
+ exportLastFile()
}
@@ -377,7 +377,7 @@ class ExportOracleData {
"HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" +
"PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" +
"from bigdata_deal_gj where CITYID='${cityCode}' and dealdate>=to_date('${dealDate}','yyyy-MM-dd')";
- allRows = dealData(sql)
+ allRows.addAll(dealData(sql))
}
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy
index 6b1009e6c..0b40eb938 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy
@@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap
@BatchOwner(Watcher.GaoJuan)
class ThirdPartyPriceBatch extends BaseBatch {
- def sDate= 202109//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
- def startDate = 202107
- def endDate = 202109
+ def sDate= 202209//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
+ def startDate = 202207
+ def endDate = 202209
// def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM"));
static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43")
@@ -502,8 +502,8 @@ class ThirdPartyPriceBatch extends BaseBatch {
def findThirdPartyPrice(def city, def statMap){
def q = new BasicDBObject()
q.put("city", city)
-
- q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate))
+ q.put("s_date", endDate)
+ // q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate))
def dbcursor = AVERAGE_STATISTICS.find(q).sort(new BasicDBObject("s_date", -1))
def map = [:]
for(def db : dbcursor){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy
index 45f3cbe35..517bfef5c 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy
@@ -41,10 +41,18 @@ class DistrictPriceExportBatch extends BaseBatch{
def headers = ["id","comm_id","city","district","name","avg_price","year_month"]
- def ret = createDatas("¸£ÖÝ")
-
- saveToDB(ret)
+ def citys = CommonDatautils.findAllCity()
+ citys.remove("¸£ÖÝ");
+ citys.add(0, "¸£ÖÝ")
+ def fz_datas = []
+ for(def city : citys){
+ def ret = createDatas("¸£ÖÝ")
+ saveToDB(ret)
+ if(city == "¸£ÖÝ"){
+ fz_datas = ret
+ }
+ }
def fileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".csv"
def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512"
@@ -52,7 +60,7 @@ class DistrictPriceExportBatch extends BaseBatch{
fileName = "D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_"+curDate+".csv"
dataCodeFileName = "D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_"+curDate+".sha512"
}
- def sb = appendResult(headers, ret)
+ def sb = appendResult(headers, fz_datas)
DataHandleUtils.outPutFile(fileName, sb, charset);
FzFtpUtils.ftpUpload(fileName)
//Éú³É¼ÓÃÜÊý¾ÝÎļþ²¢ÉÏ´«
@@ -102,7 +110,12 @@ class DistrictPriceExportBatch extends BaseBatch{
// def districts = CommonDatautils.findAllDistricts(city, "district", null);
// def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
// districts.addAll(removeDists)
- def districts = getFzDistricts(city)
+ def districts = []
+ if(city == "¸£ÖÝ"){
+ districts = getFzDistricts(city)
+ }else{
+ districts = CommonDatautils.findAllDistricts(city, "district", null);
+ }
def endDateStr = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-10"
def dataStr = DateUtils.add(endDateStr, -30)
@@ -127,14 +140,26 @@ class DistrictPriceExportBatch extends BaseBatch{
curPrice = dbo.get("avg_price")
if(lastMonthPrice && curPrice && dbo.value_type!=1){
def markup = (curPrice - lastMonthPrice)*100/lastMonthPrice
- if(Math.abs(markup)>3){
- def randMarkup = nextDouble(0, 3)
- if(markup < 0){
- markup = randMarkup*(-1)
- }else{
- markup = randMarkup
+ if(city == "¸£ÖÝ"){
+ if(Math.abs(markup)>3){
+ def randMarkup = nextDouble(0, 3)
+ if(markup < 0){
+ markup = randMarkup*(-1)
+ }else{
+ markup = randMarkup
+ }
+ curPrice = (int)(lastMonthPrice*markup/100 + lastMonthPrice)
+ }
+ }else{
+ if(Math.abs(markup)>10){
+ def randMarkup = nextDouble(0, 10)
+ if(markup < 0){
+ markup = randMarkup*(-10)
+ }else{
+ markup = randMarkup
+ }
+ curPrice = (int)(lastMonthPrice*markup/100 + lastMonthPrice)
}
- curPrice = (int)(lastMonthPrice*markup/100 + lastMonthPrice)
}
}
}else{