diff --git a/projects/fangjia-coresite/src/main/webapp/cpdb/index.ftl b/projects/fangjia-coresite/src/main/webapp/cpdb/index.ftl index 406f23e1f..74b7c1da7 100644 --- a/projects/fangjia-coresite/src/main/webapp/cpdb/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/cpdb/index.ftl @@ -142,7 +142,6 @@

CPDB大数�库,包�70多个维度的数�,��行业�场景的应用

-
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy index 82972cdd3..789603d29 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy @@ -37,7 +37,7 @@ class BigdataDealBatch extends BaseBatch{ // def endDate = 202208 def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd")); - public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) def sourceMap = ["±´¿ÇÕÒ·¿":"ke.com","ÎÒ°®ÎÒ¼Ò":"5i5j.com","Á´¼ÒÔÚÏß":"lianjia.com","·¿ÌìÏÂ":"fang.com","ÖÐÔ­µØ²ú":"centanet.com","¸£Öݲ»¶¯²ú":"","ËÑ·¿":"fang.com"] public static final def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; @@ -71,7 +71,9 @@ class BigdataDealBatch extends BaseBatch{ def rows = [] def headers = []//["³ÇÊÐID","³É½»ID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","½ÖµÀ","ÃÅÅÆºÅ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","ÆÚÊý","ËùÔÚÂ¥²ã","²ãÀàÐÍ","×ÜÂ¥²ãÊý","½¨ÖþÀàÐÍ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","·¿ÎÝÓÃ;","ÊÒÄڽṹ","³¯Ïò","×°ÐÞÇé¿ö","ÆÀ¹À±àºÅ","³É½»µ¥¼Û","³É½»×ܼÛ","É걨×ܼÛ","ÆÀ¹À×ܼÛ","ÍøÇ©ºÏͬ±àºÅ","½»Ò×ÈÕÆÚ","½»Ò×ÀàÐÍ","³öÊÛ¸¶¿î·½Ê½","³É½»ÖÜÆÚ","ÊÇ·ñÓеçÌÝ","ÔùËÍÃæ»ý£¨µØÃ滨԰£©","ÔùËÍÃæ»ý£¨Â¶Ì¨£©","ÔùËÍÃæ»ý£¨Ñǫ̂£©","ÔùËÍÃæ»ý£¨Æ®´°£©","ÔùËÍÃæ»ý£¨¸óÂ¥£©","ÔùËÍÃæ»ý£¨³µ¿â£©","ÔùËÍÃæ»ý£¨µØÏÂÊÒ£©","ÔùËÍÃæ»ý£¨ÆäËû£©","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","³É½»½ð¶î","Êý¾Ýʱ¼ä"] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + def index = 0 for(def city : citys){ + index ++ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def ppeDists = [:] @@ -87,7 +89,7 @@ class BigdataDealBatch extends BaseBatch{ def trades = getCityData(city, statMap, ppeDists) def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") rows.addAll(rets) - println city +" ³É½»¹²£º"+rets.size() + println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size() def cityDatas = [] cityDatas << headers 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 6ed03664a..ca517f31a 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) + statCity(citys) def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() for(def city : citys){ index++ @@ -82,6 +83,23 @@ class BigdataForsaleBatch extends BaseBatch{ } } + + def statCity(def citys){ + def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\ÎÞ·¿Ô´³ÇÊÐ.xlsx",0,1) + def houseCitys = [] + for(def d : datas){ + houseCitys << d['C'] + } + for(def city : citys){ + if(!houseCitys.contains(city)){ + def scity = CcbCommonUtils.specialCityMap.get(city) + if(!scity){ + println city + } + } + } + } + def exportSellCSV(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate){ def totalCount = new AtomicLong() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy index 39a26972b..08653a46a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataPoiBatch.groovy @@ -31,39 +31,40 @@ class BigdataPoiBatch extends BaseBatch{ @Override public void process(Object args) { def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() - def citys = CcbCommonUtils.citys; -// def path = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\¹«½».xlsx" - def subwaydatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\µØÌú.xlsx", 0,1) - def busDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\¹«½».xlsx", 0,1) -// def hosptialDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\Ò½Ôº.xlsx", 0,1) - def bankDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\ÒøÐÐ.xlsx", 0,1) - def dealDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\É¥Ôá·þÎñ.xlsx", 0,1) -// def schoolDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\ѧУ.xlsx", 0,1) + def citys = CcbCommonUtils.citys_252 + + +// def dealDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\POIÊý¾Ý_É¥ÔáÉèÊ©_252.xlsx", 0,1) +// def hosptialDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\POIÊý¾Ý_Ò½Ôº_¾ÛÀà2_252.xlsx", 0,1) +// def subwaydatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\POIÊý¾Ý_µØÌú_252.xlsx", 0,1) +// def busDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\POIÊý¾Ý_¹«½»_252.xlsx", 0,1) +// def bankDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\POIÊý¾Ý_ÒøÐÐ_252.xlsx", 0,1) + + def schoolDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\POIÊý¾Ý_ѧУ_252.xlsx", 0,1) // def hosptialDatas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\poi\\°Ë³ÇÊÐÒ½Ôº(¶þ´ÎÉóºË).xlsx", 0,1) def rets = [] // def rows1 = createDatas(citys, cityCodeDataMap, hosptialDatas, "Ò½Ôº") // rets.addAll(rows1) - - def rows1 = createDatas(citys, cityCodeDataMap, subwaydatas, "µØÌú") - rets.addAll(rows1) - - def rows2 = createDatas(citys, cityCodeDataMap, busDatas, "¹«½»") - rets.addAll(rows2) // -// def rows3 = createDatas(citys, cityCodeDataMap, hosptialDatas, "Ò½Ôº") +// def rows2 = createDatas(citys, cityCodeDataMap, busDatas, "¹«½»") +// rets.addAll(rows2) +// +// def rows3 = createDatas(citys, cityCodeDataMap, bankDatas, "ÒøÐÐ") // rets.addAll(rows3) - - def rows4 = createDatas(citys, cityCodeDataMap, bankDatas, "ÒøÐÐ") - rets.addAll(rows4) - - def rows5 = createDatas(citys, cityCodeDataMap, dealDatas, "É¥Ôá·þÎñ") - rets.addAll(rows5) +//// +// def rows4 = createDatas(citys, cityCodeDataMap, dealDatas, "É¥Ôá·þÎñ") +// rets.addAll(rows4) // -// def rows6 = createDatas(citys, cityCodeDataMap, schoolDatas, "ѧУ") -// rets.addAll(rows6) + def rows6 = createDatas(citys, cityCodeDataMap, schoolDatas, "ѧУ") + rets.addAll(rows6) - def headers = ["³ÇÊÐID","ÐÐÕþÇøID","ID","PoiÃû³Æ","ÀàÐÍ","ÀàÐͱàÂë","γ¶È","¾­¶È","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","ÐÔÖÊ","¼¶±ð","À´Ô´¹«Ë¾"] + +// def rows5 = createDatas(citys, cityCodeDataMap, subwaydatas, "µØÌú") +// rets.addAll(rows5) +// + + def headers = []//["³ÇÊÐID","ÐÐÕþÇøID","ID","PoiÃû³Æ","ÀàÐÍ","ÀàÐͱàÂë","γ¶È","¾­¶È","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","ÐÔÖÊ","¼¶±ð","À´Ô´¹«Ë¾"] def fileName = "/home/goojia/ccb/BIGDATA_POI_GJ.dat" if(CommonDatautils.isWindow()){ @@ -260,9 +261,9 @@ class BigdataPoiBatch extends BaseBatch{ }else if(type =="É¥Ôá·þÎñ"){ ret << "ob101" }else if(type =="ѧУ"){ - if(d['F'].contains("ÖÐѧ")){ + if(d['B'].contains("ÖÐѧ")){ ret << "ed138" - }else if(d['F'].contains("Сѧ")){ + }else if(d['B'].contains("Сѧ")){ ret << "ed114" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy index 62ce6f897..46aa81fac 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy @@ -417,6 +417,7 @@ class CcbCommonUtils { q.put("visible",0) q.put("cat", cat); q.put("city", city); +// q.put("name","ÔÆÉ½ÉгÇ") // q.put("name_cat", 0); // q.put("estate_type2", new BasicDBObject('$in', ["ÆÕͨסլ","ÉÌס"])) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy index e01954de1..a96478424 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy @@ -370,13 +370,12 @@ class DealPriceDataProcess { def deleteThirdPartyData(){ - def citys = CcbCommonUtils.citys - def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() - def month = 202208 + def citys = CcbCommonUtils.citys_92 + def month = 202209 def rows = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() for(def city : citys) { - def rets = findPeGteThirdParty(city, 202209) + def rets = findPeGteThirdParty(city, 202210) def total = 0 println city +" "+rets.size() for(def m : rets){ @@ -388,7 +387,7 @@ class DealPriceDataProcess { } def findPeGteThirdParty(cityName, yearmonth){ - def sql = "select commid,target_avg_price from avm_evaluation_item_gj where year_month=${yearmonth} and data_type='µÚÈý·½' and cityname='${cityName}' and pe>30" + def sql = "select commid,target_avg_price from avm_evaluation_item_gj where year_month=${yearmonth} and data_type='µÚÈý·½' and cityname='${cityName}' and pe>25" def rets = [] sqlInstance236.eachRow(sql,{r-> def map = [:] 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 462d76787..eabf59e2a 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 @@ -29,45 +29,45 @@ class ExportOracleData { 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()// - - exportGuidedPrice()//ËæÈ˹¤¸Ä±ä// - exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß// - -// //´¦ÀíÐ¡ÇøÇé¿ö - exportBigdataCommunity()// - exportCommunityStaging()//ûcityid + //²»»á±ä 10.25 +// exportEvaluationRateData() +// exportBigdataPoiData()// +// exportBigdataDistrictData()// +// +// exportGuidedPrice()//ËæÈ˹¤¸Ä±ä// +// exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß// +// +//// //´¦ÀíÐ¡ÇøÇé¿ö +// exportBigdataCommunity()// +// exportCommunityStaging()//ûcityid exportCommunityBuileType()// // - exportThirdPartyPrice2(lastMonth, new_dists)// - exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 - exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 - - //µÚÈý·½ÍøÕ¾È¨Öرí - exportWebsiteRate(); - - - //¼ÆËã½á¹ûÏà¹Ø - exportAvmEvaluationGJNB(curMonth) - exportAVMEvaluationItemGJNB(curMonth) - - exportCityPrice(curMonth) - exportRegionPrice(curMonth) - - exportCommunityBasePriceGj(curMonth)//ÒѺÏÏÂÃæµÄºÏ²¢ - exportCommunityBasePrice(curMonth) - - 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}")); -// okÎļþ - exportLastFile() +// exportThirdPartyPrice2(lastMonth, new_dists)// +// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 +// exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 +// +// //µÚÈý·½ÍøÕ¾È¨Öرí +// exportWebsiteRate(); +// +// +// //¼ÆËã½á¹ûÏà¹Ø +// exportAvmEvaluationGJNB(curMonth) +// exportAVMEvaluationItemGJNB(curMonth) +// +// exportCityPrice(curMonth) +// exportRegionPrice(curMonth) +// +// exportCommunityBasePriceGj(curMonth)//ÒѺÏÏÂÃæµÄºÏ²¢ +// exportCommunityBasePrice(curMonth) +// +// 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}")); +//// okÎļþ +// exportLastFile() } @@ -172,6 +172,7 @@ class ExportOracleData { 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 = [] @@ -228,8 +229,8 @@ class ExportOracleData { FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); println "BIGDATA_COMMBUILDTYPE_GJ Êý¾ÝÎļþÊä³öÍê³É......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_COMMBUILDTYPE_GJ ÉÏ´«FtpÍê³É......" +// CcbFtpUtils.ftpUpload(null, fileName, curDate) +// println "BIGDATA_COMMBUILDTYPE_GJ ÉÏ´«FtpÍê³É......" } def exportBigdataDistrictData() { @@ -632,8 +633,8 @@ class ExportOracleData { 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 Êý¾ÝÎļþÊä³öÍê³É......" CcbFtpUtils.ftpUpload(null, fileName, curDate) @@ -816,8 +817,8 @@ class ExportOracleData { fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" } def headers = []//["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", - //"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", - //"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","CREATETIME","UPDATETIME","SOURCECODE"] + //"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", + //"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","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); println "AVM_EVALUATION_GJNB Êý¾ÝÎļþÊä³öÍê³É......" @@ -1031,55 +1032,55 @@ class ExportOracleData { // // for(def city : citys) { // def cityCode = cityCodeDataMap.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 time=${month}"; - def allRows = [] - 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); + 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 time=${month}"; + def allRows = [] + 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 Êý¾ÝÎļþÊä³öÍê³É......" CcbFtpUtils.ftpUpload(null, fileName, curDate) 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 f0d9b5eb2..6b1009e6c 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,10 +22,10 @@ import java.util.concurrent.ConcurrentHashMap @BatchOwner(Watcher.GaoJuan) class ThirdPartyPriceBatch extends BaseBatch { - 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")); + def sDate= 202109//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def startDate = 202107 + def endDate = 202109 +// 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") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") @@ -67,7 +67,7 @@ class ThirdPartyPriceBatch extends BaseBatch { } def header = []//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ­¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] - FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false); + FileUtils.batchCreateFile(rows, fileName, header, "utf-8", true); } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index 573083bfb..6ccaabde3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -52,7 +52,7 @@ class YouDaDataParser { static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//ÓÑ´ïÒ»ÊÖ·¿´æÈëmongo -// task.esfParser("D:\\Êý¾Ý\\ÓÑ´ï\\2022Äê9ÔÂ\\²éѯ1.DBF");//ÓÑ´ï¶þÊÖ·¿´æÈëmongo +// task.esfParser("D:\\Êý¾Ý\\ÓÑ´ï\\2022Äê10ÔÂ\\²éѯ1.DBF");//ÓÑ´ï¶þÊÖ·¿´æÈëmongo // task.newhouseToSaveEs();//з¿±£´æµ½es // task.esfhouseToSaveEs();//¶þÊÖ·¿±£´æµ½es // task.updateFinishDateByEsfTrade();//¸ù¾Ý¶þÊֳɽ»µÄ¿¢¹¤Ê±¼äÐÞ¸Äseaweed¿âÖеĿ¢¹¤Ê±¼ä diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy index bb4f74fdf..b63201d66 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy @@ -49,7 +49,15 @@ public class BeiKeCrawlByChrome { WebDriver driver = new ChromeDriver() def citys = getAllCityUrls(driver) - citys = citys.reverse() +// citys = citys.reverse() +// def index = 0 +// for(def c : citys){ +// index++ +// if(c.city=="ºÏ·Ê"){ +// break +// } +// } +// citys = citys[index..citys.size()-1] def start = 0 // for(def i=0;i