update
This commit is contained in:
@@ -242,5 +242,13 @@
|
|||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<classifier>jdk18</classifier>
|
<classifier>jdk18</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-devtools</artifactId>-->
|
||||||
|
<!-- <!– optional 表示依赖是否向下传递 true表示不向下传递 默认值是false向下传递 –>-->
|
||||||
|
<!-- <optional>true</optional>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -38,7 +38,9 @@
|
|||||||
<a href="${wwwUrl}/resource/industry" target="_blank">行业动态</a>
|
<a href="${wwwUrl}/resource/industry" target="_blank">行业动态</a>
|
||||||
<a href="${wwwUrl}/resource/analysis" target="_blank">数据分析</a>
|
<a href="${wwwUrl}/resource/analysis" target="_blank">数据分析</a>
|
||||||
<a href="${wwwUrl}/resource/case" target="_blank">成功案例</a>
|
<a href="${wwwUrl}/resource/case" target="_blank">成功案例</a>
|
||||||
<a href="${wwwUrl}/resource/company" target="_blank">公司动态</a>
|
<a href="https://sh.fangjia.com/" target="_blank">各路客</a>
|
||||||
|
<a href="http://user.fangjia.com/" target="_blank">房价通</a>
|
||||||
|
<a href="https://www.didatai.com/" target="_blank">地数</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+20
-20
@@ -25,29 +25,29 @@ class ExportOracleData {
|
|||||||
|
|
||||||
def run(args) {
|
def run(args) {
|
||||||
citys = CcbCommonUtils.getRunningCitys(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 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 lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM")
|
||||||
def new_dists = []
|
def new_dists = []
|
||||||
//不会变
|
//不会变
|
||||||
exportEvaluationRateData()
|
// exportEvaluationRateData()
|
||||||
exportBigdataPoiData()//
|
// exportBigdataPoiData()//
|
||||||
exportBigdataDistrictData()//
|
// exportBigdataDistrictData()//
|
||||||
|
//
|
||||||
|
// exportGuidedPrice()//随人工改变//
|
||||||
|
// exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策//
|
||||||
|
//
|
||||||
|
//// //处理小区情况
|
||||||
|
// exportBigdataCommunity()//
|
||||||
|
// exportCommunityStaging()//没cityid
|
||||||
|
// exportCommunityBuileType()//
|
||||||
|
|
||||||
exportGuidedPrice()//随人工改变//
|
// exportThirdPartyPrice2(lastMonth, new_dists)//
|
||||||
exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策//
|
// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19
|
||||||
|
|
||||||
// //处理小区情况
|
|
||||||
exportBigdataCommunity()//
|
|
||||||
exportCommunityStaging()//没cityid
|
|
||||||
exportCommunityBuileType()//
|
|
||||||
|
|
||||||
exportThirdPartyPrice2(lastMonth, new_dists)//
|
|
||||||
exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19
|
|
||||||
exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01
|
exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01
|
||||||
|
|
||||||
//第三方网站权重表
|
//第三方网站权重表
|
||||||
exportWebsiteRate();
|
// exportWebsiteRate();
|
||||||
|
|
||||||
|
|
||||||
//计算结果相关
|
//计算结果相关
|
||||||
@@ -63,11 +63,11 @@ class ExportOracleData {
|
|||||||
// exportCommunityPdescribeGj(curMonth)
|
// exportCommunityPdescribeGj(curMonth)
|
||||||
// exportCommCaseDetailGj(curMonth)
|
// exportCommCaseDetailGj(curMonth)
|
||||||
|
|
||||||
// def curDate = curMonth.toString()+"28"
|
def curDate = curMonth.toString()+"28"
|
||||||
// SSHHelper jschCommand = new SSHHelper();
|
SSHHelper jschCommand = new SSHHelper();
|
||||||
// System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
|
System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
|
||||||
//ok文件
|
//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" +
|
"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" +
|
"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')";
|
"from bigdata_deal_gj where CITYID='${cityCode}' and dealdate>=to_date('${dealDate}','yyyy-MM-dd')";
|
||||||
allRows = dealData(sql)
|
allRows.addAll(dealData(sql))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap
|
|||||||
@BatchOwner(Watcher.GaoJuan)
|
@BatchOwner(Watcher.GaoJuan)
|
||||||
class ThirdPartyPriceBatch extends BaseBatch {
|
class ThirdPartyPriceBatch extends BaseBatch {
|
||||||
|
|
||||||
def sDate= 202109//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
def sDate= 202209//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||||
def startDate = 202107
|
def startDate = 202207
|
||||||
def endDate = 202109
|
def endDate = 202209
|
||||||
// def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM"));
|
// 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")
|
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 findThirdPartyPrice(def city, def statMap){
|
||||||
def q = new BasicDBObject()
|
def q = new BasicDBObject()
|
||||||
q.put("city", city)
|
q.put("city", city)
|
||||||
|
q.put("s_date", endDate)
|
||||||
q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',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 dbcursor = AVERAGE_STATISTICS.find(q).sort(new BasicDBObject("s_date", -1))
|
||||||
def map = [:]
|
def map = [:]
|
||||||
for(def db : dbcursor){
|
for(def db : dbcursor){
|
||||||
|
|||||||
+37
-12
@@ -41,10 +41,18 @@ class DistrictPriceExportBatch extends BaseBatch{
|
|||||||
|
|
||||||
def headers = ["id","comm_id","city","district","name","avg_price","year_month"]
|
def headers = ["id","comm_id","city","district","name","avg_price","year_month"]
|
||||||
|
|
||||||
def ret = createDatas("福州")
|
def citys = CommonDatautils.findAllCity()
|
||||||
|
citys.remove("福州");
|
||||||
saveToDB(ret)
|
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 fileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".csv"
|
||||||
def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512"
|
def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512"
|
||||||
@@ -52,7 +60,7 @@ class DistrictPriceExportBatch extends BaseBatch{
|
|||||||
fileName = "D:\\数据\\福州\\FJW_DISTRICT_STAT_"+curDate+".csv"
|
fileName = "D:\\数据\\福州\\FJW_DISTRICT_STAT_"+curDate+".csv"
|
||||||
dataCodeFileName = "D:\\数据\\福州\\FJW_DISTRICT_STAT_"+curDate+".sha512"
|
dataCodeFileName = "D:\\数据\\福州\\FJW_DISTRICT_STAT_"+curDate+".sha512"
|
||||||
}
|
}
|
||||||
def sb = appendResult(headers, ret)
|
def sb = appendResult(headers, fz_datas)
|
||||||
DataHandleUtils.outPutFile(fileName, sb, charset);
|
DataHandleUtils.outPutFile(fileName, sb, charset);
|
||||||
FzFtpUtils.ftpUpload(fileName)
|
FzFtpUtils.ftpUpload(fileName)
|
||||||
//生成加密数据文件并上传
|
//生成加密数据文件并上传
|
||||||
@@ -102,7 +110,12 @@ class DistrictPriceExportBatch extends BaseBatch{
|
|||||||
// def districts = CommonDatautils.findAllDistricts(city, "district", null);
|
// def districts = CommonDatautils.findAllDistricts(city, "district", null);
|
||||||
// def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
|
// def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
|
||||||
// districts.addAll(removeDists)
|
// 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 endDateStr = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-10"
|
||||||
def dataStr = DateUtils.add(endDateStr, -30)
|
def dataStr = DateUtils.add(endDateStr, -30)
|
||||||
@@ -127,14 +140,26 @@ class DistrictPriceExportBatch extends BaseBatch{
|
|||||||
curPrice = dbo.get("avg_price")
|
curPrice = dbo.get("avg_price")
|
||||||
if(lastMonthPrice && curPrice && dbo.value_type!=1){
|
if(lastMonthPrice && curPrice && dbo.value_type!=1){
|
||||||
def markup = (curPrice - lastMonthPrice)*100/lastMonthPrice
|
def markup = (curPrice - lastMonthPrice)*100/lastMonthPrice
|
||||||
if(Math.abs(markup)>3){
|
if(city == "福州"){
|
||||||
def randMarkup = nextDouble(0, 3)
|
if(Math.abs(markup)>3){
|
||||||
if(markup < 0){
|
def randMarkup = nextDouble(0, 3)
|
||||||
markup = randMarkup*(-1)
|
if(markup < 0){
|
||||||
}else{
|
markup = randMarkup*(-1)
|
||||||
markup = randMarkup
|
}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{
|
}else{
|
||||||
|
|||||||
Reference in New Issue
Block a user