diff --git a/projects/fangjia-coresite/pom.xml b/projects/fangjia-coresite/pom.xml
index 72cefc4b9..05fa7f275 100644
--- a/projects/fangjia-coresite/pom.xml
+++ b/projects/fangjia-coresite/pom.xml
@@ -242,13 +242,5 @@
1.0.0
jdk18
-
-
-
-
-
-
-
-
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy
index d01f5f82f..27732efd9 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy
@@ -68,6 +68,7 @@ class BigdataForsaleBatch extends BaseBatch{
public void process(Object args) {
def index = 0
def citys = CcbCommonUtils.getRunningCitys(args)
+ def citys = ["°¢°ÓÖÝ"]//CcbCommonUtils.getRunningCitys(args)
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
for(def city : citys){
index++
@@ -477,8 +478,14 @@ class BigdataForsaleBatch extends BaseBatch{
println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type
continue;
}
+
+ def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
+ if(vallaFlag){
+ continue;
+ }
}
+
if(!seawater.total_price){
continue;
}
@@ -538,10 +545,6 @@ class BigdataForsaleBatch extends BaseBatch{
if(floor && floor.toInteger()<1){
floor = null
}
- def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
- if(vallaFlag){
- continue;
- }
def rowMap = [:];
if(cat == "rent"){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy
new file mode 100644
index 000000000..145aad4eb
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy
@@ -0,0 +1,1194 @@
+package com.fangjia.script.ccbevaluation
+
+import com.fangjia.core.RegionData
+import com.fangjia.script.ccbevaluation.ronghe.SSHHelper
+import com.fangjia.script.ccbevaluation.ronghe.SSHHelperTest
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.util.DateUtils
+import com.fangjia.script.util.ExcelUtils
+import com.jcraft.jsch.ChannelSftp
+import groovy.sql.Sql
+import org.apache.commons.codec.digest.DigestUtils
+
+import java.sql.ResultSet
+
+class ExportOracleAllDataTest {
+
+ def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+
+ def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+ def citys = null
+
+ static main(args) {
+ def task = new ExportOracleAllDataTest()
+ task.run(args)
+
+// citys = CcbCommonUtils.citys_252
+// def rows = []
+// for(def c : citys){
+// def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region", "name"])
+// rows << [c, dists.size()]
+// }
+// ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\252³ÇÐ¡ÇøÁ¿Í³¼Æ.xlsx", rows, "ÊýÁ¿")
+ }
+
+ def run(args) {
+
+ citys = CcbCommonUtils.getRunningCitys(args)//["Ϋ·»","¼ÃÄþ","Íþº£","ÁÙÒÊ","ÃàÑô","¤ÄÏ","Ëþ³Ç","°¢ÀÕÌ©","µÏÇìÖÝ","ÈÕ¿¦Ôò"] //CcbCommonUtils.getRunningCitys(args)
+ 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 = []
+ //²»»á±ä 10.25
+ exportEvaluationRateData()
+ exportBigdataPoiData()//
+ exportBigdataDistrictData()//
+
+ exportGuidedPrice()//ËæÈ˹¤¸Ä±ä//
+ exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß//
+
+ //´¦ÀíÐ¡ÇøÇé¿ö
+ exportBigdataCommunity()//
+ exportCommunityStaging()//ûcityid
+ exportCommunityBuileType()//
+
+ exportThirdPartyPrice2(new_dists)//
+ exportBigdataForsale(new_dists) //2022-07-19
+ exportBigdataDeal( new_dists) //2022-07-01
+
+ //µÚÈý·½ÍøÕ¾È¨Öرí
+ exportWebsiteRate();
+
+ //¼ÆËã½á¹ûÏà¹Ø
+ exportAvmEvaluationGJNB()//
+ exportAVMEvaluationItemGJNB()//
+
+ exportCityPrice()//
+ exportRegionPrice()//
+
+ exportCommunityBasePriceGj()//
+ exportCommunityBasePrice()//
+
+ exportCommunityPdescribeGj()//
+ exportCommCaseDetailGj()//
+
+ def curDate = curMonth.toString()+"28"
+ // okÎļþ
+ exportInOk()
+ SSHHelperTest jschCommand = new SSHHelperTest();
+ System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}"));
+
+ }
+
+
+ def exportEvaluationRateData() {
+ def sql = "select ID,RATE_TYPE,RATE,RANK,CITY,REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from evaluate_rate_gj";
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.RATE_TYPE
+ data << r.RATE
+ data << r.RANK
+ data << r.CITY
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []//["ϵÊýID","ϵÊýÀàÐÍ","ϵÊý","ÅÅÐò","³ÇÊÐ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportWebsiteRate(){
+ def sql = "select DATA_SOURCE_ID,DATA_SOURCE,DATA_SOURCE_MAP,WEIGHT,TYPE,SOURCECODE,CITYID,CITYNAME,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from WEBSITE_CONFIG_GJ";
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.DATA_SOURCE_ID
+ data << r.DATA_SOURCE
+ data << r.DATA_SOURCE_MAP
+ data << r.WEIGHT
+ data << r.TYPE
+ data << r.SOURCECODE
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ allRows << data
+ });
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []//["ϵÊýID","ϵÊýÀàÐÍ","ϵÊý","ÅÅÐò","³ÇÊÐ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportBigdataPoiData() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID, DISTID, ID, POI_NAME, TYPE, TYPE_CODE, LATITUDE, LONGITUDE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from bigdata_poi_gj where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.CITYID
+ data << r.DISTID
+ data << r.ID
+ data << r.POI_NAME
+ data << r.TYPE
+ data << r.TYPE_CODE
+ data << r.LATITUDE
+ data << r.LONGITUDE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []//["³ÇÊÐID","ÐÐÕþÇøID","ID","PoiÃû³Æ","ÀàÐÍ","ÀàÐͱàÂë","γ¶È","¾¶È","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "BIGDATA_POI_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "BIGDATA_POI_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommunityStaging() {
+
+ def allRows = []
+ def sql = "select ID,COMMID,MASTER_COMMID,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_staging_gj";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.COMMID
+ data << r.MASTER_COMMID
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []//["·ÖÆÚID","Ð¡ÇøID","Ð¡ÇøÖ÷ÆÚID","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "COMMUNITY_STAGING_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "COMMUNITY_STAGING_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommunityBuileType() {
+// def citys = [ "ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","³¤´º","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½","Ì«Ô","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","ÀÈø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®"]
+// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID, COMMID, BUILDTYPE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, WORKDATE from bigdata_commbuildtype_gj where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.BUILDTYPE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ data << r.WORKDATE
+ allRows << data
+ });
+ }
+
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []//["³ÇÊÐID","Ð¡ÇøID"," ½¨ÖþÀàÐÍ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","Êý¾Ýʱ¼ä"]
+
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "BIGDATA_COMMBUILDTYPE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "BIGDATA_COMMBUILDTYPE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataDistrictData() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select DISTID, DISTNAME, DISTSPELL, CITYID, DISTCODE, SEQ, DISTTYPE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME ,SOURCECODE, LJXZQH, LJXZQHDM, XZQHDM, WORKDATE from bigdata_district_gj where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.DISTSPELL
+ data << r.CITYID
+ data << r.DISTCODE
+ data << r.SEQ
+ data << r.DISTTYPE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ data << r.LJXZQH
+ data << r.LJXZQHDM
+ data << r.XZQHDM
+ data << r.WORKDATE
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []
+//["ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","ÐÐÕþÇøÃû³ÆÆ´Òô","³ÇÊÐID","¹ú±êÂë","ÏÔʾ˳Ðò","ÐÐÕþÇøÀà±ð","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","Âß¼ÐÐÕþÇø","Âß¼ÐÐÕþÇø»®´úÂë","ÐÐÕþÇø»®´úÂë","Êý¾Ýʱ¼ä"]
+
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "BIGDATA_DISTRICT_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "BIGDATA_DISTRICT_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportGuidedPrice() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE,AVG_PRICE, GUIDING_PERSON, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME ,SOURCECODE from guided_price_gj where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.DEALDATE
+ data << r.AVG_PRICE
+ data << r.GUIDING_PERSON
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []
+//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ö¸µ¼ÈÕÆÚ","Ö¸µ¼¼Û¸ñ","Ìí¼ÓÈË","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "GUIDED_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "GUIDED_PRICE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommunityGuidedPrice(def date) {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, AVGPRICE, SOURCETYPE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME , SOURCECODE from community_guide_price_gj where CITYID='${cityCode}' and createtime>=to_date('${date}','yyyyMMdd')";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.AVGPRICE
+ data << r.SOURCETYPE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ö¸µ¼¼Û¸ñ","ÀàÐÍ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "COMMUNITY_GUIDE_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "COMMUNITY_GUIDE_PRICE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataDeal(def new_dists) {
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ if(new_dists){
+ def newstr = "('"+new_dists.join("','")+"')"
+ def sql1 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" +
+ "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \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" +
+ "from bigdata_deal_gj where CITYID='${cityCode}' and distid not in ${newstr}"
+ def rets1 = dealData(sql1)
+
+ def sql2 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" +
+ "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \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" +
+ "from bigdata_deal_gj where CITYID='${cityCode}' and distid in ${newstr}"
+ def rets2 = dealData(sql2)
+ allRows.addAll(rets1)
+ allRows.addAll(rets2)
+ }else{
+ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" +
+ "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \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" +
+ "from bigdata_deal_gj where CITYID='${cityCode}' ";
+ allRows.addAll(dealData(sql))
+ }
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "BIGDATA_DEAL_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "BIGDATA_DEAL_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def dealData(def sql){
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.CITYID
+ data << r.DEALID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.STREET
+ data << r.STREETNO
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.BUILDID
+ data << r.BUILDNO
+ data << r.BUILDNAME
+ data << r.UNITID
+ data << r.UNITNO
+ data << r.UNITNAME
+ data << r.HOUSEID
+ data << r.ADDRESS
+ data << r.BUILDYEAR
+ data << r.PROPTYPE
+ data << r.PROPYEARS
+ data << r.PERIODNUM
+ data << r.FLOORNUM
+ data << r.FLOORTYPE
+ data << r.FLOORCNT
+ data << r.BUILDTYPE
+ data << r.BUILDSTRU
+ data << r.BUILDAREA
+ data << r.LIVINGAREA
+ data << r.HOUSESTYLE
+ data << r.ROOMCNT
+ data << r.LIVINGROOMCNT
+ data << r.KITCHENCNT
+ data << r.BATHROOMCNT
+ data << r.HOUSEUSE
+ data << r.HOUSESTRU
+ data << r.HOUSEASPECT
+ data << r.FITMENT
+ data << r.EVALUATENO
+ data << r.DEALUNITPRICE
+ data << r.DEALTOTALPRICE
+ data << r.DECLAREPRICE
+ data << r.EVALUATEPRICE
+ data << r.CONTRACTNO
+ data << r.DEALDATE
+ data << r.DEALTYPE
+ data << r.PAYTYPE
+ data << r.DEALPERIOD
+ data << r.IFELEVATOR
+ data << r.COMPAREAGARDEN
+ data << r.COMPAREATERRACE
+ data << r.COMPAREABALCONY
+ data << r.COMPAREABAYWINDOW
+ data << r.COMPAREAATTIC
+ data << r.COMPAREAGARAGE
+ data << r.COMPAREABASEMENT
+ data << r.COMPAREAOTHER
+ data << r.DATASOURCE
+ data << r.AGENCYID
+ data << r.AGENCYNAME
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ data << r.CJJE
+ data << r.WORKDATE
+ allRows << data
+ });
+ return allRows
+ }
+
+ def exportThirdPartyPrice() {
+ def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, ZHUGE_AVG_PRICE, ANJUKE_AVG_PRICE, FANG_AVG_PRICE, LIANJIA_AVG_PRICE, CITYHOUSE_AVG_PRICE, MAITIAN_AVG_PRICE, KE_AVG_PRICE, \n" +
+ "TAOFANG_AVG_PRICE, ZHONGYUAN_AVG_PRICE, TBS_AVG_PRICE, QFANG_AVG_PRICE, FANGTAN_AVG_PRICE, FANGDUODUO_AVG_PRICE, WIWJ_AVG_PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE\n" +
+ "from third_party_price_gj";
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.YEAR_MONTH
+ data << r.ZHUGE_AVG_PRICE
+ data << r.ANJUKE_AVG_PRICE
+ data << r.FANG_AVG_PRICE
+ data << r.LIANJIA_AVG_PRICE
+ data << r.CITYHOUSE_AVG_PRICE
+ data << r.MAITIAN_AVG_PRICE
+ data << r.KE_AVG_PRICE
+ data << r.TAOFANG_AVG_PRICE
+ data << r.ZHONGYUAN_AVG_PRICE
+ data << r.TBS_AVG_PRICE
+ data << r.QFANG_AVG_PRICE
+ data << r.FANGTAN_AVG_PRICE
+ data << r.FANGDUODUO_AVG_PRICE
+ data << r.WIWJ_AVG_PRICE
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE.replaceAll(~'\\r', '')
+ allRows << data
+ })
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
+
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "THIRD_PARTY_PRICE_GJ ÉÏ´«Êý¾ÝÎļþÍê³É......"
+ }
+
+
+ def exportThirdPartyPrice2(new_dists) {
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+// fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+ def index = 0
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def allRows = []
+ if(new_dists) {
+ def newstr = "('"+new_dists.join("','")+"')"
+ def sql1 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " +
+ "COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " +
+ "CITYID='${cityCode}' and distid not in ${newstr} ";
+ def rets1 = getThirdPartyDatas(sql1)
+ allRows.addAll(rets1)
+
+ def sql2 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " +
+ "COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " +
+ "CITYID='${cityCode}' and distid in ${newstr} ";
+ def rets2 = getThirdPartyDatas(sql2)
+ allRows.addAll(rets2)
+ }else{
+ def sql = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where CITYID='${cityCode}'";
+ allRows = getThirdPartyDatas(sql)
+ }
+ if(allRows && allRows.size()>0){
+ index = index + 1
+ if(index==1){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ }else{
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ }
+ }
+ }
+
+ println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ }
+
+ def getThirdPartyDatas(def sql){
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.DISTID
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.DATA_SOURCE_ID
+ data << r.DATA_SOURCE
+ data << r.PRICE_DATE
+ data << r.COMMUNITY_PRICE
+ data << r.COMMUNITY_MAX_PRICE
+ data << r.COMMUNITY_MIN_PRICE
+ data << r.UPDATETIME
+ allRows << data
+ })
+ return allRows;
+ }
+
+ def exportBigdataCommunity(){
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID, DISTID, COMMID, DISTNAME, COMMNAME, ADDRESS, LATITUDE, LONGITUDE, LANDAREA, BUILDAREA, GREENINGRATE, PLOTRATIO, PARKINGCNT, BUILDYEAR, HOUSEUSE, ZTS, WORKDATE, UPDATEFLAG, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE, \n" +
+ "\tCOMMALIAS, STREET, STREETNO, IFNEW, INTRODUCTION, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, SOURCECODE, XZJDB, LJXZQHDM, LJXZQH,STATUS from bigdata_community_gj where CITYID='${cityCode}' ";//where cityId in (350200,150100)
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.DISTID
+ data << r.COMMID
+ data << r.DISTNAME
+ data << r.COMMNAME
+ data << r.ADDRESS
+ data << r.LATITUDE
+ data << r.LONGITUDE
+ data << r.LANDAREA
+ data << r.BUILDAREA
+ data << r.GREENINGRATE
+ data << r.PLOTRATIO
+ data << r.PARKINGCNT
+ data << r.BUILDYEAR
+ data << r.HOUSEUSE
+ data << r.ZTS
+ data << r.WORKDATE
+ data << r.UPDATEFLAG
+ data << r.UPDATETIME
+ data << r.COMMTYPE
+ data << r.COMMALIAS
+ data << r.STREET
+ data << r.STREETNO
+ data << r.IFNEW
+ data << ""
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.SOURCECODE
+ data << r.XZJDB
+ data << r.LJXZQHDM
+ data << r.LJXZQH
+ data << r.STATUS
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat"
+ }
+ def headers = []//["³ÇÊÐID","ÐÐÕþÇøID","Ð¡ÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøÃû³Æ","ÏêϸµØÖ·","γ¶È","¾¶È","Õ¼µØ×ÜÃæ»ý","½¨Öþ×ÜÃæ»ý","ÂÌ»¯ÂÊ","ÈÝ»ýÂÊ","³µÎ»ÊýÁ¿","½¨ÖþÄê´ú","·¿ÎÝÓÃ;",
+ //"×ÜÌ×Êý","Êý¾Ýʱ¼ä","¸üбê¼Ç","¸üÐÂʱ¼ä","Ð¡ÇøÀàÐÍ","Ð¡ÇøÔøÓÃÃû","½ÖµÀ","ÃÅÅÆºÅ","ÊÇ·ñÐÂÅÌ","Ð¡Çø½éÉÜ","±¸×¢","´´½¨Ê±¼ä","À´Ô´¹«Ë¾",
+ //"ÏçÕò/½ÖµÀ°ì","Âß¼ÐÐÕþÇø»®´úÂë","Âß¼ÐÐÕþÇø»®","״̬"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "BIGDATA_COMMUNITY_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "BIGDATA_COMMUNITY_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataForsale(new_dists){
+ //["±±¾©","ÉϺ£"]
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []//["³ÇÊÐID","³öÊÛID","¹ÒÅÆ·¿ÎÝID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","µ¥¼Û","×ܼÛ","³öÊÛ¸¶¿î·½Ê½","ËùÔÚÂ¥²ã","×ÜÂ¥²ã","½¨ÖþÀàÐÍ","ÊÒÄڽṹ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","³¯Ïò","×°ÐÞÇé¿ö","ÊÇ·ñÓеçÌÝ","¼¸Ìݼ¸»§","·¢²¼Ê±¼ä","µ½ÆÚʱ¼ä","ÊÇ·ñÊ×·¢","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","·¢²¼ÈË","·¢²¼È˵绰","ÃèÊöÐÅÏ¢","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","¸½¼ÓÐÅÏ¢"]
+ def index = 0
+ for(def city : citys){
+ def cityCode = cityCodeMap.get(city)
+
+ def allRows = []
+ if(new_dists){
+ def newstr = "('"+new_dists.join("','")+"')"
+ def sql1 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" +
+ " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" +
+ " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj " +
+ "where cityId='${cityCode}' and distid not in ${newstr}";
+ def rets1 = getHouseDatas(sql1)
+ allRows.addAll(rets1)
+ }else{
+ def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" +
+ " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" +
+ " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' ";
+ allRows = getHouseDatas(sql)
+ }
+ if(allRows.size()>0){
+ index = index + 1
+ if(index == 1){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ }else{
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ }
+
+ }
+ }
+
+ if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý
+ def newstr = "('"+new_dists.join("','")+"')"
+ def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" +
+ " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" +
+ " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH " +
+ "from bigdata_forsale_gj where distid in ${newstr}"
+ def rets2 = getHouseDatas(sql2)
+ if(rets2.size()>0){
+ FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true);
+ }
+ }
+ println "BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "BIGDATA_FORSALE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def getHouseDatas(sql){
+ def allRows = []
+ def index = 0
+ sqlInstance.eachRow(sql,{r->
+ index = index+1
+ println r.CITYNAME +" "+index
+ def data = []
+ data << r.CITYID
+ data << r.FORSALEID
+ data << r.PROPCODE
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.BUILDID
+ data << r.BUILDNO
+ data << r.BUILDNAME
+ data << r.UNITID
+ data << r.UNITNO
+ data << r.UNITNAME
+ data << r.HOUSEID
+ data << r.ADDRESS
+ data << r.BUILDYEAR
+ data << r.PROPTYPE
+ data << r.PROPYEARS
+ data << r.UNITPRICE
+ data << r.TOTALPRICE
+ data << r.PAYTYPE
+ data << r.FLOORNUM
+ data << r.FLOORCNT
+ data << r.BUILDTYPE
+ data << r.HOUSESTRU
+ data << r.BUILDSTRU
+ data << r.BUILDAREA
+ data << r.LIVINGAREA
+ data << r.HOUSESTYLE
+ data << r.ROOMCNT
+ data << r.LIVINGROOMCNT
+ data << r.KITCHENCNT
+ data << r.BATHROOMCNT
+ data << r.HOUSEASPECT
+ data << r.FITMENT
+ data << r.IFELEVATOR
+ data << r.ELEVATORHOUSE
+ data << r.PUBLISHTIME
+ data << r.EXPIRETIME
+ data << r.IFFIRST
+ data << r.DATASOURCE
+ data << r.AGENCYID
+ data << r.AGENCYNAME
+ data << r.PUBLISHER
+ data << r.PHONE
+ data << ""
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ data << r.ATTACH
+ allRows << data
+// if(allRows.size()%200000==0){
+// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+// allRows.clear()
+// }
+ });
+ return allRows
+ }
+
+
+ def exportAvmEvaluationGJNB(){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
+ def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
+ fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat"
+ }
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" +
+ "ANN_CALC_NUM, ANN_CALC_COVERAGE, TEST_NUM, TEST_COMM_NUM, TEST_COMM_COVERAGE, PPE15_COVERAGE, RATE_MEDIAN, COEFFICIENT,DEAL_TEST_CASE_NUM, DEAL_TEST_COMM_NUM, DEAL_TEST_COMM_COVERAGE, DEAL_PPE15_COVERAGE, \n" +
+ "DEAL_COEFFICIENT, DEAL_RATE_MEDIAN, THIRD_TEST_CASE_NUM, THIRD_TEST_COMM_NUM, THIRD_TEST_COMM_COVERAGE, THIRD_PPE15_COVERAGE, THIRD_COEFFICIENT, THIRD_RATE_MEDIAN, \n" +
+ "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from avm_evaluation_gj where CITYID='${cityCode}' ";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.YEAR_MONTH
+ data << r.COMMUNITY_NUM
+ data << r.HAS_PRICE_COMMUNITY_NUM
+ data << r.PRICE_COVERAGE
+ data << r.ARTIFICIAL_CALC_NUM
+ data << r.ARTIFICIAL_CALC_COVERAGE
+ data << r.SAMPLE_CALC_NUM
+ data << r.SAMPLE_CALC_COVERAGE
+ data << r.ANN_CALC_NUM
+ data << r.ANN_CALC_COVERAGE
+ data << r.TEST_NUM
+ data << r.TEST_COMM_NUM
+ data << r.TEST_COMM_COVERAGE
+ data << r.PPE15_COVERAGE
+ data << r.RATE_MEDIAN
+ data << r.COEFFICIENT
+ data << r.DEAL_TEST_CASE_NUM
+ data << r.DEAL_TEST_COMM_NUM
+ data << r.DEAL_TEST_COMM_COVERAGE
+ data << r.DEAL_PPE15_COVERAGE
+ data << r.DEAL_COEFFICIENT
+ data << r.DEAL_RATE_MEDIAN
+ data << r.THIRD_TEST_CASE_NUM
+ data << r.THIRD_TEST_COMM_NUM
+ data << r.THIRD_TEST_COMM_COVERAGE
+ data << r.THIRD_PPE15_COVERAGE
+ data << r.THIRD_COEFFICIENT
+ data << r.THIRD_RATE_MEDIAN
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+ def headers = []
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false);
+ println "AVM_EVALUATION_GJNB Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ CcbFtpTestUtils.ftpUpload(null, fileName1, curDate)
+ println "AVM_EVALUATION_GJNB ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportAVMEvaluationItemGJNB(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
+ def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
+ fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat"
+ }
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, CONFIDENCE,TARGET_AVG_PRICE, \n" +
+ "to_char(DEALDATE,'yyyy-mm-dd hh24:mi:ss') as DEALDATE, UNIT_PRICE, BUILDAREA, FITMENT, HOUSEASPECT, FLOORNUM, FLOORCNT, DATA_TYPE, RATE, PE, \n" +
+ "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME from avm_evaluation_item_gj where CITYID='${cityCode}' ";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.YEAR_MONTH
+ data << r.CALC_AVG_PRICE
+ data << r.AVG_PRICE
+ data << r.CALC_TYPE
+ data << r.CONFIDENCE
+ data << r.TARGET_AVG_PRICE
+ data << r.DEALDATE
+ data << r.UNIT_PRICE
+ data << r.BUILDAREA
+ data << r.FITMENT
+ data << r.HOUSEASPECT
+ data << r.FLOORNUM
+ data << r.FLOORCNT
+ data << r.DATA_TYPE
+ data << r.RATE
+ data << r.PE
+ data << r.CREATETIME
+ allRows << data
+ });
+ }
+ def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","CONFIDENCE","TARGET_AVG_PRICE","DEALDATE","UNIT_PRICE","BUILDAREA","FITMENT","HOUSEASPECT","FLOORNUM","FLOORCNT","DATA_TYPE","RATE","PE","CREATETIME"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false);
+ println "AVM_EVALUATION_ITEM_GJNB Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ CcbFtpTestUtils.ftpUpload(null, fileName1, curDate)
+ println "AVM_EVALUATION_ITEM_GJNB ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommunityBasePrice(){
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where CITYID='${cityCode}' ";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.YEAR_MONTH
+ data << r.CALC_AVG_PRICE
+ data << r.AVG_PRICE
+ data << r.CALC_TYPE
+ data << r.FAKE_RATE
+ data << r.DIFF_RATE
+ data << r.CONFI_RATE
+ data << r.CORR_RATE
+ data << r.CONFIDENCE
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
+ def fileName1 = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
+ fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false);
+ println "COMMUNITY_BASE_PRICE_GJNB Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ CcbFtpTestUtils.ftpUpload(null, fileName1, curDate)
+ println "COMMUNITY_BASE_PRICE_GJNB ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommunityBasePriceGj(){
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where CITYID='${cityCode}' ";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.YEAR_MONTH
+ data << r.CALC_AVG_PRICE
+ data << r.AVG_PRICE
+ data << r.CALC_TYPE
+ data << r.FAKE_RATE
+ data << r.DIFF_RATE
+ data << r.CONFI_RATE
+ data << r.CORR_RATE
+ data << r.CONFIDENCE
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "COMMUNITY_BASE_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "COMMUNITY_BASE_PRICE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCityPrice(){
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+
+ def sql = "select ID, CITYID, CITYNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from city_price_gj where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.YEAR_MONTH
+ data << r.CALC_AVG_PRICE
+ data << r.PRICE
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "CITY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "CITY_PRICE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportRegionPrice(){
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from DISTRICT_PRICE_GJ where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.DISTID
+ data << r.DISTNAME
+ data << r.YEAR_MONTH
+ data << r.CALC_AVG_PRICE
+ data << r.PRICE
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"]
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "DISTRICT_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "DISTRICT_PRICE_GJ ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommunityPdescribeGj(){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.COMMUNITY_ID
+ data << r.CITYID
+ data << r.CITY_NAME
+ data << r.DISTRICT_CODE
+ data << r.DISTRICT_NAME
+ data << r.COMMUNITY_NAME
+ data << r.PQ_NAME
+ data << r.BASE_PRICE
+ data << r.CONFIDENCE_LEVEL
+ data << r.CNT
+ data << r.MIN_PRICE
+ data << r.MEDIANPRICE
+ data << r.MEANPRICE
+ data << r.MAX_PRICE
+ data << r.TIME
+ data << r.FIRSTDATAT
+ data << r.THIRDDATA
+ data << r.RELATIVEERROR
+ data << r.SKEWNESS
+ data << r.PQ_PRICE_RANGE
+ data << r.DISTRICT_PRICE_RANGE
+ data << r.DESCRIPTION
+ data << r.PRIV_BASE_PRICE
+ data << r.IS_ARTTFICIAL
+ data << r.PRIV_FINAL_PRICE
+ data << r.CREATE_DATE
+ data << r.PRICE
+ data << r.PRICE_SOURCE
+ data << r.CASE_MD_PRICE
+ data << r.CASE_AVG_PRICE
+ data << r.INDEX_LABEL
+ data << r.MAIN_PROPERTY
+ data << r.COMMTYPE
+ data << r.NEW_DEAL_PRICE
+ data << r.NEW_DEAL_DATE
+ data << r.PRICE_MOM_RATIO
+ data << r.MAX_MOM_RATIO
+ data << r.PRICE_YOY_RATIO
+ data << r.SATUR_RATIO
+ data << r.NEIGHBOR_PRICE
+ allRows << data
+ });
+ }
+
+ println allRows.size()
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "community_p_describe_gj Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "community_p_describe_gj ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommCaseDetailGj(){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+
+ def index = 0
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select ID, CITYID, COMMUNITY_ID, NETLISTING_ID, PRICE_DATE, to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE from comm_case_detail_gj where cityid='${cityCode}'";
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.ID
+ data << r.CITYID
+ data << r.COMMUNITY_ID
+ data << r.NETLISTING_ID
+ data << r.PRICE_DATE
+ data << r.CREATE_DATE
+ allRows << data
+ });
+ if (allRows && allRows.size() > 0) {
+ index = index + 1
+ if (index == 1) {
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ } else {
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ }
+ }
+ }
+ println "comm_case_detail_gj Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "comm_case_detail_gj ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportLastFile(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ def dataCodeFileName = "/ccb_evaluation/${curDate}.ok"
+ if(CommonDatautils.isWindow()){
+ dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\${curDate}.ok"
+ }
+ FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate)
+ }
+
+ def exportOkFile(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ def dataCodeFileName = "/ccb_evaluation/${curDate}.ok"
+ if(CommonDatautils.isWindow()){
+ dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\${curDate}.ok"
+ }
+ FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate)
+ }
+
+ def exportInOk(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
+ Vector files = CcbFtpTestUtils.listFileNames(curDate)
+ Iterator fileVec = files.iterator()
+ def fileRows = []
+ while(fileVec.hasNext()){
+ ChannelSftp.LsEntry file = fileVec.next()
+
+ if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){
+ fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(file.getFilename(), curDate)
+ }
+ }
+ def fileName = "/ccb_evaluation/${curDate}.ok"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\${curDate}.ok"
+ }
+ FileUtils.createTxtFile(fileRows, fileName, "utf-8", false);
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "ͳ¼ÆÎļþ³¤¶ÈokÎļþ ÉÏ´«FtpÍê³É......"
+ }
+}
+
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy
index 431fc02c2..c4d5579f4 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy
@@ -976,9 +976,9 @@ class ExportOracleDataTest {
});
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
- def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat"
}
def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"]
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
@@ -1007,9 +1007,9 @@ class ExportOracleDataTest {
});
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
- def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat"
}
def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"]
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy
index 6981c7149..bf34601ed 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy
@@ -44,7 +44,7 @@ class GuiDingPriceBatch extends BaseBatch{
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
//Ìí¼Ó×Ô¼º¿âÖеÄÈ˹¤Ö¸µ¼¼Û
- def prices = CcbCommonUtils.findPersonPrice(city, "2022-10-22", "2022-10-27")
+ def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-09")
if(prices){
def distMap = getDistrictMap(city)
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)
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 0b40eb938..9fd693e39 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
@@ -502,8 +502,18 @@ class ThirdPartyPriceBatch extends BaseBatch {
def findThirdPartyPrice(def city, def statMap){
def q = new BasicDBObject()
q.put("city", city)
+<<<<<<< .mine
+
+ //q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate))
+
+ 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))
+
+
+>>>>>>> .theirs
+
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/ccbevaluation/data/AddressCut.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy
index 19bf6561b..4c66509ec 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy
@@ -7,8 +7,12 @@ import com.fangjia.script.gj.district.FangjiaClientUtils
import com.fangjia.script.lixue.util.DBUtils
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 org.elasticsearch.xpack.sql.jdbc.EsDataSource
+import java.sql.ResultSet
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.CountDownLatch
import java.util.concurrent.ExecutorService
@@ -16,13 +20,79 @@ import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicLong
class AddressCut extends BaseBatch{
+
+
+ final DBCollection thirdPartyPriceColl = MongoUtils.getCollectionByName("fangjia_craw", "third_party_price", "192.168.0.235", 27018)
+
+ public static EsDataSource dataSource = new EsDataSource()
+ private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200?timezone=UTC&page.size=240&connect.timeout=240000&network.timeout=60000&page.timeout=240000&query.timeout=90000"
+ static {
+ dataSource.setUrl(address)
+ Properties connectionProperties = new Properties()
+ connectionProperties.put("user", "developer")
+ connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3")
+ dataSource.setProperties(connectionProperties)
+ }
static main(args) {
runBatch(new AddressCut(), args);
}
@Override
public void process(Object args) {
- sameAddr()
+// sameAddr() //ÏàͬµØÖ·Ð¡Çø
+// roadMatch()
+ addAnjukeRoad()
+
+ }
+
+ def addAnjukeRoad(){
+ ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ð¡ÇøµØÖ·²ð·Ö\\Ð¡ÇøµØÖ·ÇзÖ(½á¹û)_1.xlsx", { d ->
+ def roads = findThirdPartyPrice(d['A'], d['B'], d['C'], "Á´¼Ò")
+ if(roads){
+ d['O'] = roads[0]
+ }
+ });
+ }
+
+ def findThirdPartyPrice(city, region, name, source){
+ def q = new BasicDBObject()
+ q.put("city", city)
+ q.put("region", region)
+ q.put("name", name)
+ q.put("source", source)
+ def dbcursor = thirdPartyPriceColl.find(q).sort(new BasicDBObject("s_date", -1)).limit(10)
+ def roads = []
+ for(def d : dbcursor){
+ if(d.address && !roads.contains(d.address)){
+ roads << d.address
+ }
+ }
+ return roads
+ }
+
+ def roadMatch(){
+ def cityRoadsMap = queryPoiMap()
+ println "µÀ·¼ÓÔØÍê³É....."
+ ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ð¡ÇøµØÖ·²ð·Ö\\Ð¡ÇøµØÖ·ÇзÖ(½á¹û)_1.xlsx", { d ->
+ def roads = cityRoadsMap.get(d['A'])
+// if (roads && roads.contains(d['E'])) {
+// d['L'] = "ÊÇ"
+// println d['A'] + " " + d['E']
+// }
+
+ if(roads){
+ for(def road : roads){
+ if(!d['L'] && d['E'] && d['E'].toString().contains(road)){
+ d['L'] = "Öмä°üº¬"
+ d['M'] = road
+ println d['A'] + " " + d['E']
+ break;
+ }
+ }
+ }
+ })
+
+
}
def sameAddr() {
@@ -143,4 +213,29 @@ class AddressCut extends BaseBatch{
latch.await()
return rows;
}
+
+ def queryPoiMap(){
+ final StringBuffer sqlBuffer = new StringBuffer()
+ sqlBuffer.append("SELECT cityname,name,type FROM amap_poi WHERE 1=1")
+// sqlBuffer.append(" and cityname = '" + city + "'")
+// sqlBuffer.append(" and name = '" + name + "'")
+ sqlBuffer.append(" and type like '%µÀ·Ãû%'")
+// sqlBuffer.append(" and MATCH(name,'${name}')")
+// sqlBuffer.append(" and source = '¸ßµÂ' order by score() desc")
+ ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString())
+ def cityMap = [:]
+ while (rs.next()) {
+ def city = rs.getString("cityname");
+ def road = rs.getString("name")
+ def roads = cityMap.get(city)
+ if(!roads){
+ roads = new HashSet()
+ }
+ roads << road
+ cityMap.put(city, roads)
+
+ }
+ return cityMap;
+ }
+
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy
index 1aa5a391f..d7be2d646 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy
@@ -1,6 +1,7 @@
package com.fangjia.script.ccbevaluation.data
import com.fangjia.script.ccbevaluation.CcbCommonUtils
+import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.common.DataHandleUtils
import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.ExcelUtils
@@ -19,7 +20,22 @@ class CcbDataStat {
static main(args) {
def task = new CcbDataStat()
// task.run()
- task.tradeRun()
+// task.tradeRun()
+ task.regionDistStat()
+ }
+
+ def regionDistStat(){
+ def citys = CcbCommonUtils.citys_252
+ def rows = []
+ for(def c : citys){
+ def regions = CommonDatautils.getRegionListByCity(c)
+ for(def r : regions){
+ def count = CommonDatautils.findRegionDistrictCount("district",c, r)
+ rows << [c, r, count]
+ println c +" "+r +" "+count
+ }
+ }
+ ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\ÇøÓòÐ¡ÇøÁ¿Í³¼Æ.xlsx", rows, "ͳ¼Æ")
}
def tradeRun(){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy
index 3d79e39fb..9c68829cd 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy
@@ -19,11 +19,11 @@ class EsMonthHouseStat {
def task = new EsMonthHouseStat()
// task.run()
// task.tradeRun()
-// task.houseRun()
+ task.houseRun()
// task.statHouseUpdateCount()
- task.statDistHouse()
+// task.statDistHouse()
}
def statDistHouse(){