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 index a8b061813..b9b854e62 100644 --- 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 @@ -41,6 +41,9 @@ class ExportOracleAllDataTest { 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 = [] + + exportBigdataForsale(new_dists) //2022-07-19 + //不会变 10.25 exportEvaluationRateData() exportBigdataPoiData()// @@ -55,7 +58,6 @@ class ExportOracleAllDataTest { exportCommunityBuileType()// exportThirdPartyPrice2(new_dists)// - exportBigdataForsale(new_dists) //2022-07-19 exportBigdataDeal( new_dists) //2022-07-01 // // //第三方网站权重表 @@ -669,22 +671,24 @@ class ExportOracleAllDataTest { " 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) + def rets1 = getHouseDatas(sql1, fileName) + if(rets1){ + 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) + allRows = getHouseDatas(sql, fileName) } - if(allRows.size()>0){ - index = index + 1 - if(index == 1){ - FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - }else{ + 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); - } - +// } } } @@ -694,7 +698,7 @@ class ExportOracleAllDataTest { " 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) + def rets2 = getHouseDatas(sql2, fileName) if(rets2.size()>0){ FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); } @@ -704,7 +708,7 @@ class ExportOracleAllDataTest { println "BIGDATA_FORSALE_GJ 上传Ftp完成......" } - def getHouseDatas(sql){ + def getHouseDatas(sql, fileName){ def allRows = [] def index = 0 sqlInstance.eachRow(sql,{r-> @@ -764,12 +768,18 @@ class ExportOracleAllDataTest { data << r.SOURCECODE data << r.ATTACH allRows << data -// if(allRows.size()%200000==0){ -// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); -// allRows.clear() -// } + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + allRows.clear() + } }); - return allRows + + if(allRows.size>0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + allRows.clear() + } +// return allRows + return null }