${fjtEvaluation.districtName!}
-
${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("�")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}�#if>${fjtEvaluation.roomNum!}室 �新评估 >
+
<#if fjtEvaluation.certificateAddress??>${fjtEvaluation.certificateAddress!}<#else>${fjtEvaluation.address!}#if> <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("�")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}�#if>${fjtEvaluation.roomNum!}室 �新评估 >
*请确认与产�地�一致
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0 && bohaiEvaluationAudit.inquirePrice gt 0>
-
评估总价:<#if fjtEvaluation??><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?int}#if> 万元#if>
+
评估总价:<#if fjtEvaluation??><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?string('0.##')}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?string('0.##')}#if> 万元#if>
评估�价:<#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/fjtEvaluation.houseArea)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/fjtEvaluation.houseArea)?int}#if> 元/平米
<#if role?? && role==17 && loanInfoMap??>
所属分类:${loanInfoMap.type!}类
@@ -71,15 +71,15 @@
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.lastPrice??>
<#else>
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.hopePrice??>
@@ -499,23 +499,10 @@
contentType: false,
processData: false,
success: function (data) {
- if(data == null){
+
+ if(data.msg && data.msg.indexOf("�功")>-1){
alert("ä¸Šä¼ æˆ�功");
window.location.reload();
- // $("#file_wrap_list").remove();
- // var boxes = $("input[name=reportFiles]")
- // if(boxes.length>1){
- // var i = 0;
- // boxes.forEach(function(element) {
- // i++;
- // if(i>2){
- // element.remove();
- // }
- // });
- // }
- // $("a.create-actions08").empty().text("请选择类型")
- // $("#fileClass").val("")
- // $("a.create-actions08").removeClass("selected")
}else{
alert(data.msg);
}
diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml
index 9469b6d02..811ec290c 100644
--- a/projects/fangjia-script/pom.xml
+++ b/projects/fangjia-script/pom.xml
@@ -171,6 +171,11 @@
ojdbc14
10.2.0.4.0
+
+ org.postgresql
+ postgresql
+ 42.2.1
+
com.yahoo.platform.yui
yuicompressor
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy
new file mode 100644
index 000000000..ca14ea514
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy
@@ -0,0 +1,88 @@
+package com.fangjia.script.ccbevaluation
+
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.util.DateUtils
+import groovy.sql.Sql
+import org.bson.types.ObjectId
+
+class AddThirdPartyPrice {
+
+ public static def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+
+ static main(args) {
+ def task = new AddThirdPartyPrice()
+ task.run()
+ }
+
+ def run(){
+//
+ def citys = ["ÁÖÖ¥","º£Î÷ÖÝ","ÌìÃÅ","´óÐ˰²Áë","ÙÙÖÝ","º×¸Ú","ÈÕ¿¦Ôò","ͳ·¬", "°¢ÀÕÌ©","µÏÇìÖÝ","DZ½","Ëþ³Ç","¿Ë×ÎÀÕËÕ","ºÍÌï","¼ÎÓø¹Ø"]
+ def rows = []
+ def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
+ for(def c : citys){
+ println c +" "+cityCodeDatas.get(c)
+ def dists = CcbCommonUtils.findAllDistrictByCity(c, "district", ["city", "region", "name","name_cat", "estate_type2","lng"])
+ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(c)
+ def rets = createDate(dists, distCodeMap)
+ println dists.size() +" "+rets.size()
+ if(rets){
+ rows.addAll(rets)
+ }
+ }
+
+ def fileName = "/home/goojia/ccb/BIGDATA_THIRD_PARTY_PRICE_GJ.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_THIRD_PARTY_PRICE_GJ.dat"
+ }
+
+ def header = []
+ FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false);
+ }
+
+ def createDate(dists, distCodeMap){
+ def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
+
+ def results = []
+ for(def d : dists){
+
+ def cityId = cityCodeDatas.get(d.city)
+ def data = distCodeMap.get(d.region)
+ def avgPrice = findGuidedPrice(cityId, d._id.toString())
+ if(!avgPrice){
+ def dbo = CommonDatautils.queryHouseCalutePrice(d.city, d.region, d.name, DateUtils.parseFromTightYYYYMMDD("2022-05-01"))
+ if(dbo){
+ avgPrice = dbo.avg_price
+ }
+ }
+ if(avgPrice){
+ def ret = []
+ ret << new ObjectId().toString()
+ ret << cityId
+ ret << data.district_code
+ ret << d._id.toString()
+ ret << d.name
+ ret << "18"
+ ret << "21ÊÀ¼Í"
+ ret << 202209
+ ret << avgPrice
+ ret << ""
+ ret << ""
+ ret << DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd")
+ results << ret
+ }
+ }
+ return results;
+ }
+
+
+ def findGuidedPrice(cityId, commid){
+ def sql = "select avg_price from guided_price_gj where cityid='${cityId}' and commid='${commid}' and dealdate>=to_date('2022-01-01','yyyy-MM-dd')"
+ def avg_price = null
+ sqlInstance.eachRow(sql,{r->
+ avg_price = r.avg_price
+ });
+ return avg_price
+ }
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy
index 3b92e612c..431972b91 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy
@@ -23,7 +23,7 @@ class BigdataBuildingBatch extends BaseBatch{
@Override
public void process(Object args) {
- def citys = CcbCommonUtils.citys_all;
+ def citys = CcbCommonUtils.getRunningCitys(args)
def rows = []
def headers = []
for (def city : citys) {
@@ -36,7 +36,7 @@ class BigdataBuildingBatch extends BaseBatch{
def distMap = getDistrictMap(city)
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, buildingMap)
println city + " " + rets.size()
- def fileName = "/home/goojia/ccb/bigdata_building_fjw.dat"
+ def fileName = "/ccb/bigdata_building_fjw.dat"
if(CommonDatautils.isWindow()){
fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\bigdata_building_fjw.dat"
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy
index c06cef98e..27ed0ad49 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy
@@ -8,6 +8,7 @@ import com.fangjia.script.Watcher
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.gj.ccb.CcbCodeUtils
import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.gj.district.FangjiaClientUtils
import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.OpenApiClient
@@ -27,7 +28,7 @@ import java.util.regex.Pattern
@BatchOwner(Watcher.GaoJuan)
class BigdataCommunityBatch extends BaseBatch{
- public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20)
+ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10)
static main(args) {
runBatch(new BigdataCommunityBatch(), args);
@@ -35,7 +36,7 @@ class BigdataCommunityBatch extends BaseBatch{
@Override
public void process(Object args) {
- def citys = CcbCommonUtils.citys_92;
+ def citys = CcbCommonUtils.getRunningCitys(args)
def rows = []
@@ -50,7 +51,7 @@ class BigdataCommunityBatch extends BaseBatch{
index ++
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
- def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat"])
+ def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"])
def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city))
def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists)
@@ -107,7 +108,6 @@ class BigdataCommunityBatch extends BaseBatch{
if(ret){
rets << ret
}
-
} catch (Exception e) {
e.printStackTrace()
} finally {
@@ -175,38 +175,33 @@ class BigdataCommunityBatch extends BaseBatch{
ret << "pa101"
ret << ""
if(dist.address){
- if(dist.address.toString().contains("Ū")){
- String number = DataUtil.match(dist.address, Pattern.compile("\\d+Ū"))
- if(number){
- ret << dist.address.toString().substring(0, dist.address.toString().indexOf(number))
- ret << dist.address.toString().substring(dist.address.toString().indexOf(number), dist.address.toString().size())
+ if(dist.street){
+ ret << dist.street
+ if(dist.street_number){
+ ret << dist.street_number
}else{
ret << ""
- ret << ""
}
}else{
- def jsonObj = null
- if(dist.address){
-// jsonObj = OpenApiClient.addressMatch(dist.city, dist.address, "property", false, dist.region, dist.name)
- jsonObj = OpenApiClient.standard1Action(dist.city, dist.address)
- }
- if(jsonObj && jsonObj.street){
- if(jsonObj.street){
- ret << jsonObj.street
- }else{
- ret << ""
- }
-
- if(jsonObj.streetNumber){
- ret << jsonObj.streetNumber
- }else{
- ret << ""
- }
-
- }else{
- ret << ""
- ret << ""
- }
+ ret << ""
+ ret << ""
+// def jsonObj = FangjiaClientUtils.addressStructure(dist.city, dist.address)
+// if(jsonObj && jsonObj.result && jsonObj.result.street){
+// if(jsonObj.result.street){
+// ret << jsonObj.result.street
+// }else{
+// ret << ""
+// }
+//
+// if(jsonObj.result.streetNumber){
+// ret << jsonObj.result.streetNumber
+// }else{
+// ret << ""
+// }
+// }else{
+// ret << ""
+// ret << ""
+// }
}
}else{
ret << ""
@@ -225,7 +220,6 @@ class BigdataCommunityBatch extends BaseBatch{
println dist.city + " "+dist.name+" error"
e.printStackTrace()
}
-
return ret;
}
}
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 3456607da..af28b3fd4 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
@@ -33,8 +33,8 @@ import java.util.regex.Pattern
@BatchOwner(Watcher.GaoJuan)
class BigdataDealBatch extends BaseBatch{
-// def startDate = 202206
-// def endDate = 202208
+ def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM"));
+ def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd"));
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30)
@@ -63,11 +63,12 @@ class BigdataDealBatch extends BaseBatch{
curDate = args[1].toString().toInteger()
}
-// for(def city : citys){
-//// if(!ccbCitys.contains(city)){
-// addDealPriceMatch(city);
-//// }
-// }
+ println "curDate:"+curDate
+ for(def city : citys){
+// if(!ccbCitys.contains(city)){
+ addDealPriceMatch(city);
+// }
+ }
def rows = []
def headers = []//["³ÇÊÐID","³É½»ID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","½ÖµÀ","ÃÅÅÆºÅ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","ÆÚÊý","ËùÔÚÂ¥²ã","²ãÀàÐÍ","×ÜÂ¥²ãÊý","½¨ÖþÀàÐÍ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","·¿ÎÝÓÃ;","ÊÒÄڽṹ","³¯Ïò","×°ÐÞÇé¿ö","ÆÀ¹À±àºÅ","³É½»µ¥¼Û","³É½»×ܼÛ","É걨×ܼÛ","ÆÀ¹À×ܼÛ","ÍøÇ©ºÏͬ±àºÅ","½»Ò×ÈÕÆÚ","½»Ò×ÀàÐÍ","³öÊÛ¸¶¿î·½Ê½","³É½»ÖÜÆÚ","ÊÇ·ñÓеçÌÝ","ÔùËÍÃæ»ý£¨µØÃ滨԰£©","ÔùËÍÃæ»ý£¨Â¶Ì¨£©","ÔùËÍÃæ»ý£¨Ñǫ̂£©","ÔùËÍÃæ»ý£¨Æ®´°£©","ÔùËÍÃæ»ý£¨¸óÂ¥£©","ÔùËÍÃæ»ý£¨³µ¿â£©","ÔùËÍÃæ»ý£¨µØÏÂÊÒ£©","ÔùËÍÃæ»ý£¨ÆäËû£©","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","³É½»½ð¶î","Êý¾Ýʱ¼ä"]
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
@@ -85,15 +86,17 @@ class BigdataDealBatch extends BaseBatch{
println city +" "+youdaDatas.size()
}
-
def trades = getCityData(city, statMap, ppeDists)
- def rets = createData(trades, cityCodeDataMap, distCodeMap, "other")
- rows.addAll(rets)
- println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size()
+ if(trades){
+ def rets = createData(trades, cityCodeDataMap, distCodeMap, "other")
+ rows.addAll(rets)
+ println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size()
+
+ def cityDatas = []
+ cityDatas << headers
+ cityDatas.addAll(rows)
+ }
- def cityDatas = []
- cityDatas << headers
- cityDatas.addAll(rows)
}
def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat"
@@ -101,7 +104,7 @@ class BigdataDealBatch extends BaseBatch{
fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_DEAL_GJ.dat"
}
- FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", true);
+ FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false);
println "txt Éú³É " + rows.size()
}
@@ -111,8 +114,10 @@ class BigdataDealBatch extends BaseBatch{
final CountDownLatch latch = new CountDownLatch(rets.size())
// def lianjiaPriceMap = findThirdPartyPrice("ÉϺ£")
- def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd')
- def lianjiaPriceMap = getDistrictStatByCity("ÉϺ£", startDate)
+// def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd')
+// def lianjiaPriceMap = getDistrictStatByCity("ÉϺ£", startDate)
+
+ def ccbPriceMap = getCommunityPrices("ÉϺ£")
for(def i=0;i0){
@@ -478,8 +484,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;
}
@@ -539,11 +551,203 @@ class BigdataForsaleBatch extends BaseBatch{
if(floor && floor.toInteger()<1){
floor = null
}
- def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
- if(vallaFlag){
+
+ def rowMap = [:];
+ if(cat == "rent"){
+ rowMap.rent_type = seawater.rent_type
+ if(seawater.avg_price && seawater.avg_price>1000){
+ continue
+ }
+
+ if(seawater.avg_price && seawater.avg_price<10){
+ continue
+ }
+
+ }
+ rowMap.houseId = seawater.id
+ rowMap.city = CcbCommonUtils.getCcbCity(city)
+ //rowMap.region =seawater.region
+ //rowMap.address = seawater.address
+
+
+ rowMap.area = seawater.area
+ rowMap.total_price = seawater.total_price
+ rowMap.avg_price = seawater.avg_price
+ rowMap.height = seawater.height=="null"?null:seawater.height
+ if(rowMap.height && rowMap.height<1){
+ rowMap.height = null
+ }
+ rowMap.floor = floor=="null"?null:floor
+ rowMap.room = seawater.room=="null"?null:seawater.room
+ rowMap.hall = seawater.hall=="null"?null:seawater.hall
+ rowMap.toilet = seawater.toilet=="null"?null:seawater.toilet
+ if(CcbCommonUtils.rootMap.get(seawater.root)){
+ rowMap.root = CcbCommonUtils.rootMap.get(seawater.root)
+ }else{
+ rowMap.root = "99"
+ }
+
+ def direction = parseDirection(seawater.direction)
+ rowMap.direction = direction=="null"?null:direction
+
+ def fitment = parseFitment(seawater.fitment)
+ rowMap.fitment = fitment=="null"?null:fitment
+
+ if(seawater.p_date instanceof String){
+ seawater.p_date = seawater.p_date.toInteger()
+ }
+ if(seawater.p_date<=20200101){
+ //seawater.p_date.toString().replace("2019","2020")//
+ rowMap.p_date = DateUtils.getRandomDate("2020-01-01", "2020-07-31")
+ rowMap.c_date = rowMap.p_date
+ rowMap.m_date = rowMap.p_date
+ }else{
+ rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss")
+ rowMap.c_date = DateUtils.getConverDate(seawater.m_date)
+ rowMap.m_date = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-18 10:00:00"//DateUtils.getConverDate(seawater.m_date)
+ }
+
+ rets << rowMap
+ }
+ }
+
+ println name +" "+houses.size()+" last:"+rets.size()
+ return rets;
+ }
+
+
+ def findHousesByMdate(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2, rets1){
+ def date = DateUtils.addMonth(endDate.toString(), -3, "yyyyMMdd")
+ def startMdate = DateUtils.parseFromTightByPattern(date,"yyyyMMdd")
+ def endMdate = DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd")
+
+ QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(date.toInteger()).to(endDate).includeLower(false).includeUpper(false);
+ QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false);
+
+
+ QueryBuilder date_range_mdate = QueryBuilders.rangeQuery("m_date").from(startMdate.getTime()).to(endMdate.getTime()).includeLower(true).includeUpper(false);
+
+ QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat))
+ .must(date_range).must(area_range).must(date_range_mdate)
+
+ if(!alias){
+ alias = []
+ }
+ if(!alias.contains(name)){
+ alias.add(name)
+ }
+
+
+ if(name.contains("ÅªÐ¡Çø")){
+ def newName = name.replace("ÅªÐ¡Çø","Ū")
+ if(!alias.contains(newName)){
+ alias << newName
+ }
+ }
+
+ if(alias && alias.size()>0){
+ BoolQueryBuilder inBuilder = QueryBuilders.boolQuery();
+ for(def s : alias){
+ inBuilder.should(QueryBuilders.matchQuery("district_name", s));
+ }
+ queryBuilder.must(inBuilder)
+ }
+
+
+ def rets = []
+ def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
+
+ if(houses){
+
+ def ids = new HashSet()
+ for(def h : rets1){
+ ids << h.houseId
+ }
+ for (int k=0;k60){
+ continue;
+ }
+
+// if(!seawater.room){
+// continue;
+// }
+ if(!seawater.room){
+ seawater.room = null
+ }
+
+ if(seawater.room){
+ if(seawater.room>=11 || seawater.room<1){
+ continue;
+ }
+ }
+
+ if(!seawater.hall){
+ seawater.hall = null
+ }
+ if(seawater.hall && (seawater.hall>=5 || seawater.hall<1)){
+ continue;
+ }
+ if(!seawater.toilet){
+ seawater.toilet = null
+ }
+ if(seawater.toilet && (seawater.toilet>=5 || seawater.toilet<1)){
+ continue;
+ }
+
+
+ def floor = parseFloor(seawater.floor_info)
+ if(seawater.height && floor && floor.isNumber()){
+ if(floor.toInteger()>seawater.height){
+ floor = null
+ seawater.height = null
+ }
+
+ }
+
+ if(!floor){
+ seawater.floor = null
+ }
+ if(floor && floor.toInteger()<1){
+ floor = null
+ }
+
def rowMap = [:];
if(cat == "rent"){
rowMap.rent_type = seawater.rent_type
@@ -585,8 +789,6 @@ class BigdataForsaleBatch extends BaseBatch{
def fitment = parseFitment(seawater.fitment)
rowMap.fitment = fitment=="null"?null:fitment
-
-
if(seawater.p_date instanceof String){
seawater.p_date = seawater.p_date.toInteger()
}
@@ -598,7 +800,7 @@ class BigdataForsaleBatch extends BaseBatch{
}else{
rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss")
rowMap.c_date = DateUtils.getConverDate(seawater.m_date)
- rowMap.m_date = DateUtils.getConverDate(seawater.m_date)
+ rowMap.m_date = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-18 10:00:00"//DateUtils.getConverDate(seawater.m_date)
}
rets << rowMap
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 46aa81fac..b17d97a59 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
@@ -16,7 +16,7 @@ import groovy.sql.Sql
class CcbCommonUtils {
//
- public static def citys_all = [ "³¤´º","ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½","Ì«Ô","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","ÀÈø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®","Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ","ÁÉÑô","¸·ÐÂ","¾ÆÈª","ÇÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ƕ«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","ÍÁê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","ÍÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","ÇÎ÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀÂêÒÀ","ÁÙ²×","DZ½","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢ÀÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","ŽÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"]
+ public static def citys_all = [ "ÉϺ£","³¤´º","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½","Ì«Ô","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","ÀÈø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®","Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ","ÁÉÑô","¸·ÐÂ","¾ÆÈª","ÇÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ƕ«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","ÍÁê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","ÍÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","ÇÎ÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀÂêÒÀ","ÁÙ²×","DZ½","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢ÀÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","ŽÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"]
public static def citys_92 = [ "ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","³¤´º","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½","Ì«Ô","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","ÀÈø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®"]
public static def citys_252 = ["Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ","ÁÉÑô","¸·ÐÂ","¾ÆÈª","ÇÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ƕ«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","ÍÁê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","ÍÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","ÇÎ÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀÂêÒÀ","ÁÙ²×","DZ½","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢ÀÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","ŽÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"]
@@ -42,8 +42,7 @@ class CcbCommonUtils {
public static DSCollection dataStoreConnection = null;
- public static def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
- "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+ public static def sqlInstance = null
public static def getRunningCitys(def args){
@@ -53,13 +52,21 @@ class CcbCommonUtils {
def countStr = args[0]
if(countStr=="344"){
citys = CcbCommonUtils.citys_all
+ sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
}else if(countStr=="92"){
citys = CcbCommonUtils.citys_92
+ sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
}else if(countStr=="252"){
citys = CcbCommonUtils.citys_252
+ sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
}
}else{
citys = CcbCommonUtils.citys_92
+ sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
}
println "ÔËÐгÇÊÐÊýÁ¿£º"+citys.size()
return citys;
@@ -417,7 +424,7 @@ class CcbCommonUtils {
q.put("visible",0)
q.put("cat", cat);
q.put("city", city);
-// q.put("name","ÔÆÉ½ÉгÇ")
+// q.put("name","Ãù´äÀ¶Íå")
// q.put("name_cat", 0);
// q.put("estate_type2", new BasicDBObject('$in', ["ÆÕͨסլ","ÉÌס"]))
@@ -562,4 +569,9 @@ class CcbCommonUtils {
return maxSeqno
}
+ public static def deleteGuidedPrice(def dealdate){
+ def sql = "delete from guided_price_gj where dealdate=to_date('${dealdate}','yyyy-mm-dd')"
+ sqlInstance.executeUpdate(sql)
+ }
+
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy
index 7083cb615..81958589e 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy
@@ -7,13 +7,13 @@ import org.apache.commons.codec.digest.DigestUtils
class CcbFtpTestUtils {
- static def ftpServer = "192.168.0.86"
+ static def ftpServer = "192.168.0.86"//45
static def ftpPort = 17495
static def ftpUser = "ccb"
static def ftpPassword = "ccb!@#"
- static def ftpPath = "/home/ccb/output/"
+ static def ftpPath = "/home/ccb_evaluation/output/"
- static def ftpPath_rh = "/home/ccb_rh/output/"
+ static def ftpPath_rh = "/home/ccb_ronghe/output/"
static SFTP sftp = new SFTP();
static ChannelSftp sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword);
@@ -70,6 +70,32 @@ class CcbFtpTestUtils {
}
+ static def listFileNames(type, month){
+ //ÉÏ´«µ½ftp
+ sftpChannel = reConnect();
+ Vector files = null;
+ if(type && type=="rh"){
+ files = sftp.listFiles(ftpPath_rh+ month+"/", sftpChannel);
+ }else{
+ files = sftp.listFiles(ftpPath+ month+"/", sftpChannel);
+ }
+ return files
+ }
+
+ static def getFileLength(String type, String path, String month){
+ sftpChannel = reConnect();
+ def size = 0;
+ if(type && type=="rh"){
+ size = sftp.getFileSize(ftpPath_rh+ month+"/"+path, sftpChannel)
+ }else{
+ size = sftp.getFileSize(ftpPath+ month+"/"+path, sftpChannel)
+ }
+ return size
+ }
+
+
+
+
static main(args) {
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy
index 6b972553e..124911f34 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpUtils.groovy
@@ -3,6 +3,7 @@ package com.fangjia.script.ccbevaluation
import com.fangjia.script.common.DataHandleUtils
import com.fangjia.script.jiangnanblank.SFTP
import com.jcraft.jsch.ChannelSftp
+import com.jcraft.jsch.SftpATTRS
import org.apache.commons.codec.digest.DigestUtils
class CcbFtpUtils {
@@ -64,6 +65,13 @@ class CcbFtpUtils {
return files
}
+ static def getFileLength(String path, String month){
+ sftpChannel = reConnect();
+ def size = sftp.getFileSize(ftpPath+ month+"/"+path, sftpChannel)
+ return size
+ }
+
+
static main(args) {
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 a96478424..6b28570f1 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
@@ -25,8 +25,9 @@ class DealPriceDataProcess {
def task = new DealPriceDataProcess()
// task.process()//Ô˵±³É½»peÖµ²»ºÃʱÐУ¬ÀÉý³É½»¼Û¸ñ¼°É¾³ýpeÌ«´óÊý¾Ý
// task.addLianJiaPrice();
- task.deleteThirdPartyData()
+// task.deleteThirdPartyData()
// task.delDealByPe()
+ task.delDealData()
}
def delDealByPe(){
@@ -370,20 +371,33 @@ class DealPriceDataProcess {
def deleteThirdPartyData(){
- def citys = CcbCommonUtils.citys_92
- def month = 202209
+ def citys = CcbCommonUtils.citys_all
+ def month = 202211
def rows = []
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
+ def set = new HashSet()
for(def city : citys) {
- def rets = findPeGteThirdParty(city, 202210)
+ def rets = findPeGteThirdParty(city, 202212)
def total = 0
println city +" "+rets.size()
+ if(rets){
+ set.add(city)
+ }
for(def m : rets){
def cityId = cityCodeDatas.get(city)
def sql = "delete from BIGDATA_THIRD_PARTY_PRICE_GJ where cityid='${cityId}' and commid='${m.commid}' and price_date=${month} and community_price=${m.price}"
sqlInstance236.executeUpdate(sql)
}
}
+ println set.toString()
+ }
+
+ def findThirdCount(sqlInstance236, sql){
+ def count = 0
+ sqlInstance236.eachRow(sql,{r->
+ count = r.count()
+ });
+ return count
}
def findPeGteThirdParty(cityName, yearmonth){
@@ -398,4 +412,25 @@ class DealPriceDataProcess {
return rets
}
+ def delDealData(){
+ ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\³É½»\\º¼Öݳɽ»É¾³ý12-23.xlsx", { d ->
+ if(d['A']){
+ def count = delDealDataByid(d['A'],d['K'].toString().toDouble(), d['H'].toString().toDouble().toInteger())
+ println d['B']+" "+count
+ }
+ })
+ }
+
+ def delDealDataByid(commid, area, price){
+ def sql = "select count(*) as count from bigdata_deal_gj where commid='${commid}' and buildarea=${area} and DEALUNITPRICE=${price} " +
+ "and dealdate>=TO_DATE('2022-11-01','yyyy-MM-dd')"
+// sqlInstance236.executeUpdate(sql)
+ def count = 0
+ sqlInstance236.eachRow(sql,{r->
+ count = r.count
+ });
+ return count
+ }
+
+
}
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..79eda643f
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy
@@ -0,0 +1,1200 @@
+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.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+
+ def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+ def citys = null
+ def curDate = "20221228"//DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+
+ 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 = "202212"//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 = []
+
+ exportBigdataForsale(new_dists) //2022-07-19
+
+ //²»»á±ä 10.25
+ exportEvaluationRateData()
+ exportBigdataPoiData()//
+ exportBigdataDistrictData()//
+
+ exportGuidedPrice()//ËæÈ˹¤¸Ä±ä//
+ exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß//
+
+ //´¦ÀíÐ¡ÇøÇé¿ö
+ exportBigdataCommunity()//
+ exportCommunityStaging()//ûcityid
+ exportCommunityBuileType()//
+
+ exportThirdPartyPrice2(new_dists)//
+ exportBigdataDeal( new_dists) //2022-07-01
+//
+// //µÚÈý·½ÍøÕ¾È¨Öرí
+ exportWebsiteRate();
+//
+// //¼ÆËã½á¹ûÏà¹Ø
+ exportAvmEvaluationGJNB()//
+ exportAVMEvaluationItemGJNB()//
+
+ exportCityPrice()//
+ exportRegionPrice()//
+
+ exportCommunityBasePriceGj()//
+ exportCommunityBasePrice()//
+
+ exportCommunityPdescribeGj()//
+ exportCommCaseDetailGj()//
+
+// // 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 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 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 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 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 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 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 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 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 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 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 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 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 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, 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, fileName)
+ }
+ 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);
+// }
+ }
+ }
+
+ 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, fileName)
+ 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, fileName){
+ 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, [], "utf-8", true);
+ allRows.clear()
+ }
+ });
+
+ if(allRows.size>0){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ allRows.clear()
+ }
+// return allRows
+ return null
+ }
+
+
+ def exportAvmEvaluationGJNB(){
+
+ 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 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 = []
+ 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"]
+
+ 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
+ if(allRows.size()%200000==0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", true);
+ allRows.clear()
+ }
+ });
+ }
+
+ if(allRows.size()>0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", true);
+ }
+
+ 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 = []
+ 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"]
+ 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
+ if(allRows.size()%200000==0){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ allRows.clear()
+ }
+ });
+ }
+
+ if(allRows.size()>0){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ }
+
+ 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 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 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 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
+
+ if(allRows.size()%200000==0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ allRows.clear()
+ }
+ });
+ }
+
+ println allRows.size()
+ if(allRows.size()>0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ allRows.clear()
+ }
+ println "community_p_describe_gj Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "community_p_describe_gj ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommCaseDetailGj(){
+
+ 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 allRows = []
+ 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}'";
+ 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.size()%200000==0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ allRows.clear()
+ }
+ });
+ }
+
+ if(allRows.size()>0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ allRows.clear()
+ }
+ println "comm_case_detail_gj Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "comm_case_detail_gj ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportLastFile(){
+ 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 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(){
+ Vector files = CcbFtpTestUtils.listFileNames(null, 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(null, 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/ExportOracleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy
index fed4c92bd..22861ba1d 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy
@@ -25,11 +25,11 @@ class ExportOracleData {
def run(args) {
citys = CcbCommonUtils.getRunningCitys(args)
-// def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
+ def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM")
def new_dists = []
- //²»»á±ä
+ //²»»á±ä 10.25
exportEvaluationRateData()
exportBigdataPoiData()//
exportBigdataDistrictData()//
@@ -48,9 +48,9 @@ class ExportOracleData {
//µÚÈý·½ÍøÕ¾È¨Öرí
exportWebsiteRate();
-
-
- //¼ÆËã½á¹ûÏà¹Ø
+//
+//
+// //¼ÆËã½á¹ûÏà¹Ø
// exportAvmEvaluationGJNB(curMonth)
// exportAVMEvaluationItemGJNB(curMonth)
//
@@ -62,11 +62,11 @@ class ExportOracleData {
//
// exportCommunityPdescribeGj(curMonth)
// exportCommCaseDetailGj(curMonth)
-
+//
// def curDate = curMonth.toString()+"28"
// SSHHelper jschCommand = new SSHHelper();
// System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
- //okÎļþ
+//// okÎļþ
// exportLastFile()
}
@@ -377,7 +377,7 @@ class ExportOracleData {
"HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" +
"PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" +
"from bigdata_deal_gj where CITYID='${cityCode}' and dealdate>=to_date('${dealDate}','yyyy-MM-dd')";
- allRows = dealData(sql)
+ allRows.addAll(dealData(sql))
}
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy
new file mode 100644
index 000000000..f1f2e17bc
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy
@@ -0,0 +1,1171 @@
+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.jcraft.jsch.ChannelSftp
+import groovy.sql.Sql
+import org.apache.commons.codec.digest.DigestUtils
+
+import java.sql.ResultSet
+
+class ExportOracleDataTest {
+
+ def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+
+ def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+ def citys = null
+
+ static main(args) {
+ def task = new ExportOracleDataTest()
+ task.run(args)
+ }
+
+ def run(args) {
+ citys = 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(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"
+ // 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 dealDate, 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 dealdate>=to_date('${dealDate}','yyyy-MM-dd') 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}' and dealdate>=to_date('${dealDate}','yyyy-MM-dd')";
+ 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(price_date, 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 price_date=${price_date} 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}' and price_date=${price_date} ";
+ 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(publishDate, 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 publishtime>=to_date('${publishDate}','yyyy-MM-dd') 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}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd')";
+ 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(yearMonth){
+ 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 YEAR_MONTH = ${yearMonth}";
+ def allRows = []
+ 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 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 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"]
+ 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(yearMonth){
+ 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 YEAR_MONTH = ${yearMonth}";
+ def allRows = []
+ 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 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 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(yearMonth){
+ 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 year_month=${yearMonth}";
+ def allRows = []
+ 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(yearMonth){
+ 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 year_month=${yearMonth}";
+ def allRows = []
+ 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(month){
+ 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 year_month=${month}";
+ def allRows = []
+ 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(month){
+ 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 year_month=${month}";
+ def allRows = []
+ 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(month){
+
+// def citys = CcbCommonUtils.citys;
+// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+ 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 = []
+//
+// 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 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 in (202110,202111,202112,202201)";
+ 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 Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload(null, fileName, curDate)
+ println "community_p_describe_gj ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportCommCaseDetailGj(month){
+
+// def citys = CcbCommonUtils.citys;
+ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+
+ 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 = []
+
+ for(def city : citys){
+ def cityCode = cityCodeDataMap.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}' and price_date=${month}";
+ 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.size()%200000==0){
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+ allRows.clear()
+ }
+ });
+ if(allRows.size()>0){
+ 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(null, 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(null, 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/ExportOracleEvaluationData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy
index 7258934fa..419f170b0 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy
@@ -12,13 +12,16 @@ class ExportOracleEvaluationData {
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+ def citys = null
+ def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+
static main(args) {
def task = new ExportOracleEvaluationData()
- task.run()
+ task.run(args)
}
- def run() {
-
+ def run(args) {
+ citys = CcbCommonUtils.getRunningCitys(args)
def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
//¼ÆËã½á¹ûÏà¹Ø
@@ -44,49 +47,53 @@ class ExportOracleEvaluationData {
}
def exportAvmEvaluationGJNB(yearMonth){
- 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 YEAR_MONTH = ${yearMonth}";
+
def allRows = []
- 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
- });
+ 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 YEAR_MONTH = ${yearMonth} and 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 curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
@@ -107,38 +114,43 @@ class ExportOracleEvaluationData {
}
def exportAVMEvaluationItemGJNB(yearMonth){
- 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 YEAR_MONTH = ${yearMonth}";
+
def allRows = []
- 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
- });
+
+ 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 YEAR_MONTH = ${yearMonth} AND 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 curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
@@ -157,31 +169,35 @@ class ExportOracleEvaluationData {
}
def exportCommunityBasePrice(yearMonth){
- 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 year_month=${yearMonth}";
+
def allRows = []
- 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
- });
+ 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 year_month=${yearMonth} AND 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/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
@@ -200,31 +216,35 @@ class ExportOracleEvaluationData {
}
def exportCommunityBasePriceGj(yearMonth){
- 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 year_month=${yearMonth}";
+
def allRows = []
- 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
- });
+ 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 year_month=${yearMonth} AND 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/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
@@ -239,21 +259,24 @@ class ExportOracleEvaluationData {
}
def exportCityPrice(month){
- 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 year_month=${month}";
def allRows = []
- 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
- });
+ 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 year_month=${month} AND 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/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
@@ -268,23 +291,27 @@ class ExportOracleEvaluationData {
}
def exportRegionPrice(month){
- 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 year_month=${month}";
def allRows = []
- 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
- });
+ 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 year_month=${month} AND 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/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
@@ -300,68 +327,67 @@ class ExportOracleEvaluationData {
def exportCommunityPdescribeGj(month){
-// def citys = CcbCommonUtils.citys;
-// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
def fileName = "/ccb/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 = []
-//
-// 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 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 in (202110,202111,202112,202201)";
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
- });
+
+ 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 time=${month} AND 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 Êý¾ÝÎļþÊä³öÍê³É......"
CcbFtpUtils.ftpUpload(null, fileName, curDate)
println "community_p_describe_gj ÉÏ´«FtpÍê³É......"
@@ -369,8 +395,6 @@ class ExportOracleEvaluationData {
def exportCommCaseDetailGj(month){
- def citys = CcbCommonUtils.citys;
- def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
def fileName = "/ccb/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
@@ -380,8 +404,8 @@ class ExportOracleEvaluationData {
def headers = []
for(def city : citys){
- def cityCode = cityCodeDataMap.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}' and price_date=${month}";
+ 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}' and price_date=${month} AND CITYID='${cityCode}'";
def allRows = []
sqlInstance.eachRow(sql,{r->
def data = []
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy
index b28516075..4d8b7fa02 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy
@@ -29,7 +29,9 @@ class FjwPricePkCcbPrice {
// task.updatePrice()
// task.addFjwPrice()
// task.addCcbPrice()
- task.addMarketPrice()
+
+ task.addCcbPriceFromGuided()
+// task.addMarketPrice()
}
def addMarketPrice(){
@@ -66,6 +68,24 @@ class FjwPricePkCcbPrice {
})
}
+ def addCcbPriceFromGuided(){
+ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+ ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\È˹¤Ö¸µ¼¼Û2.xls",{d->
+ if(d['B'] && !d['O']){
+ def cityId = d['D']
+ def dist = CommonDatautils.findDistrictById(d['B'])
+ if(dist){
+ def map = getCommunityBasePriceGjByCommid(cityId, dist._id.toString(), 202209)
+ if(map){
+ d['O'] = map.avg_price
+ d['P'] = map.calc_type
+ d['Q'] = map.credit
+ }
+ }
+ }
+ })
+ }
+
def updatePrice(){
def index = 0
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 ba2d7db15..537e09d1e 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
@@ -30,21 +30,25 @@ class GuiDingPriceBatch extends BaseBatch{
def sDate= Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"));
def static final DBCollection dataProcessColl = CrawalDBUtil.getDataProcessCol();
+ def curDate= DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-15";
+
static main(args) {
runBatch(new GuiDingPriceBatch(), args);
}
@Override
public void process(Object args) {
- def citys = CcbCommonUtils.citys_252;
+ def citys = CcbCommonUtils.getRunningCitys(args)
def rows = []
+ CcbCommonUtils.deleteGuidedPrice(curDate)
for (def city : citys) {
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
//Ìí¼Ó×Ô¼º¿âÖеÄÈ˹¤Ö¸µ¼¼Û
- def prices = CcbCommonUtils.findPersonPrice(city, "2021-09-01", "2022-10-12")
+ def prices = CcbCommonUtils.findPersonPrice(city, "2022-11-25", "2022-12-24")
+// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
if(prices){
def distMap = getDistrictMap(city)
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)
@@ -150,7 +154,7 @@ class GuiDingPriceBatch extends BaseBatch{
ret << CcbCommonUtils.getCcbCity(dist.city)
ret << areaData.district_code
ret << areaData.district
- ret << DateUtils.formatDateByPattern(ps.guiding_date, "yyyy-MM-dd HH:mm:ss")
+ ret << curDate//DateUtils.formatDateByPattern(ps.guiding_date, "yyyy-MM-dd HH:mm:ss")
ret << ps.guiding_value
ret << "·¿¼ÛÍø"
ret << ""
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy
index 31ae30039..14a238118 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy
@@ -33,8 +33,8 @@ import java.util.regex.*;
def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
-//def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
-// "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com")
@@ -45,6 +45,56 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw
def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017";
def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl)
+
+
+//def citys = ['ËÕÖÝ','º¼ÖÝ','Äþ²¨','ÎÂÖÝ','¼ÎÐË','ºþÖÝ','ÉÜÐË','½ð»ª','áéÖÝ','ÖÛɽ','̨ÖÝ','ÀöË®']
+//
+//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+//def rets = []
+//for(def c : citys){
+// def citycode = cityCodeDataMap.get(c)
+// def datas = findAllData(sqlInstance236, citycode)
+// def totalCount = datas.size()
+// def landareaCount = 0;
+// def buildareaCount = 0
+// def greeningrateCount = 0
+// def plotratioCount = 0
+// for(def m : datas){
+// if(m.landarea){
+// landareaCount ++
+// }
+// if(m.buildarea){
+// buildareaCount++
+// }
+// if(m.greeningrate){
+// greeningrateCount++
+// }
+// if(m.plotratio){
+// plotratioCount++
+// }
+// }
+//
+// def landAreaPre = landareaCount*100/totalCount
+// def buildAreaPre = buildareaCount*100/totalCount
+// def greeningratePre = greeningrateCount*100/totalCount
+// def plotratioPre = plotratioCount*100/totalCount
+// rets << [c, totalCount, landAreaPre, buildAreaPre, greeningratePre, plotratioPre]
+//}
+//
+//ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\²âÊÔ\\12³Ç¸²¸ÇÂÊͳ¼Æ.xlsx",rets, "¸²¸ÇÂÊ")
+
+def findAllData(sqlInstance236, citycode){
+ def sql = "select landarea,buildarea,greeningrate,plotratio from bigdata_community_fjw where cityid='${citycode}'"
+ def rets = []
+ sqlInstance236.eachRow(sql,{r->
+ rets << ["landarea":r.landarea, "buildarea":r.buildarea, "greeningrate":r.greeningrate, "plotratio":r.plotratio]
+ });
+ return rets
+
+}
+
+
+
////def url = "https://sh.anjuke.com"
////def s = DataHandleUtils.findMatchPattern(name, "https://\\w+.anjuke.com")
////println s
@@ -446,6 +496,56 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
//// }
////},0)
//
+
+//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\252¸ö³ÇÊÐɾ³ýÐ¡Çø.xlsx",{d->
+// if(d['A']){
+// def dbo = CommonDatautils.findDistrictById(d['D'])
+// if(dbo){
+// def udata = new BasicDBObject()
+//// udata.put("name_cat", 11)
+// udata.put("status", 1)
+// udata.put("m_date",new Date())
+//
+// def q = new BasicDBObject()
+// q.put("_id", dbo._id)
+// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
+// }else{
+// println dbo._id.toString() +" ûÕÒµ½"
+// }
+// }
+//},0)
+
+//def citys = ["º£¿Ú","ÈýÑÇ","Èýɳ","Îåָɽ","Çíº£","ÙÙÖÝ","ÎIJý","ÍòÄþ","¶«·½","¶¨°²","ÍͲý","³ÎÂõ","ÁÙ¸ß","°×ɳ","²ý½","ÀÖ¶«","ÁêË®","±£Í¤","ÇíÖÐ"]
+//for(def c : citys){
+// def districts = CommonDatautils.findAllDistrictByCity(c, "district", ["city","name"])
+// println c +" "+districts.size()
+//}
+
+//def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\252³ÇµÚÈý·½¾ù¼Û.xlsx", { d ->
+//// cityCodeMap.each {k,v->
+//// if(d['A'].toString()==v){
+//// d['C'] = k
+//// println k
+//// }
+//// }
+//// if(!d['D']){
+//// d['D'] = findCount(d['A'].toString().toDouble().toInteger().toString(), sqlInstance94)
+//// }
+// d['F'] = findThirdCommCount(d['A'].toString().toDouble().toInteger().toString(), sqlInstance94)
+//
+//});
+
+//def citys = CcbCommonUtils.citys_252
+//def runCitys = ['ÁijÇ','±¦¼¦','ÉØ¹Ø','¸·Ñô','ÒË´º','ÖÜ¿Ú','ºÓÔ´','ÐÃÖÝ','ÈýÃÅÏ¿','ÓÀÖÝ','áéÖÝ','Å̽õ','°×Òø','ÓñϪ','´ïÖÝ','¾°µÂÕò','º×±Ú','ÁÉÑô','ÁùÅÌË®','Õżҽç','º£Î÷ÖÝ','Ð˰²ÃË','°¢°ÓÖÝ','ÄÇÇú','Î÷Ë«°æÄÉÖÝ','ÁÉÔ´','ºªµ¦','ƽ¶¥É½','ÄÏÑô','ÉÌÇð','ÄÏÆ½','»Æ¸Ô','¶õ¶û¶à˹','ãòÖÝ','Áù°²','ºù«µº','³±ÖÝ','ËÞÖÝ','ÇìÑô','»³»¯','ÕÅÒ´','Ƕ«ÄÏ','ÔÆ¸¡','±¾Ïª','°ÙÉ«','ÒÁ´º','ÕÑͨ','ÎýÁÖ¹ùÀÕÃË','¿ËÀÂêÒÀ','ÌìÃÅ','²©¶ûËþÀ','´óÐ˰²Áë','Ϋ·»','ÃàÑô','÷ÖÝ','ÏåÑô','°üÍ·','Ôæ×¯','¶«Óª','ÐÅÑô','½úÖÐ','¿ª·â','³ÐµÂ','ïÃû','¾£ÃÅ','ºìºÓ','¤ÄÏ','ÌúÁë','»ÆÉ½','ÏÌÄþ','ÑÓ°²','¹ãÔª','ÎÚÀ¼²ì²¼','ËæÖÝ','ÒæÑô','ÑôȪ','ÄÚ½','¾ÆÈª','±Ï½Ú','°²Ë³','Àö½','ÉÌÂå','À´±ö','ÇÎ÷ÄÏ','·À³Ç¸Û','ÍÈÊ','ÙÙÖÝ','³ç×ó','ºâÑô','ÏÌÑô','ÐÂÏç','Äϳä','¾£ÖÝ','µÂÑô','ººÖÐ','ÏæÌ¶','³à·å','¼Ñľ˹','µ¤¶«','»´ÄÏ','¸§ÖÝ','ÀöË®','¹ã°²','ÙñÖÝ','²ý¼ª','¶õÖÝ','°×³Ç','¶÷Ê©','ÒÁÀç','ÍÁê','ÁÖÖ¥','º£¶«','¹ðÁÖ','ÁÙ·Ú','μÄÏ','±õÖÝ','ºÊÔó','Т¸Ð','Óª¿Ú','å§Ñô','¸§Ë³','×Ô¹±','ÐÂÓà','¼¦Î÷','ÇÕÖÝ','»´±±','°²¿µ','×ÊÑô','ÎÚº£','ÖÐÎÀ','º×¸Ú','ʯ×ìɽ','ÈÕ¿¦Ôò','²ý¶¼','µÂºêÖÝ','ͳ·¬','°¢ÀÕÌ©','ÁÙÒÊ','Íþº£','Ì©°²','ËÞǨ','µÂÖÝ','°²Ñô','פÂíµê','Ë绯','ÉÏÈÄ','ÆÎÌï','°ö²º','´óÇì','äðºÓ','Ê®Ñß','½ú³Ç','Ðû³Ç','ÖÛɽ','ÉÛÑô','´óÀí','³þÐÛ','ÌìË®','³ØÖÝ','ËÉÔ','¸·ÐÂ','°ÍÒô¹ùÀã','ÏÉÌÒ','ÎäÍþ','ÆÕ¶ý','ºÓ³Ø','Í´¨','µÏÇìÖÝ','DZ½','ºØÖÝ','Ëþ³Ç','¼ÃÄþ','½ÃÅ','¸ÓÖÝ','Ðí²ý','³üÖÝ','ÁúÑÒ','Ô˳Ç','³¤ÖÎ','ÀÖɽ','³»ÖÝ','ËìÄþ','Çú¾¸','ºôÂ×±´¶û','Ñô½','³¯Ñô','°ÍÑåÄ×¶û','Ë·ÖÝ','¦µ×','ÎàÖÝ','°ÍÖÐ','ÇÄÏ','ÎâÖÒ','ÁÙÏÄ','Á¹É½ÖÝ','¶¨Î÷','ƼÏç','¸ÊÄÏ','ÅÊÖ¦»¨','¿Ë×ÎÀÕËÕ','ɽÄÏ','ÁÙ²×','½ð²ý','ÐĮ̈','ºâË®','ÄþµÂ','ÓÜÁÖ','°°É½','½¹×÷','ĵµ¤½','ÆëÆë¹þ¶û','üɽ','ÈýÃ÷','ÂÀÁº','¼ª°²','ƽÁ¹','ͨÁÉ','½ÒÑô','»ÆÊ¯','Ò˱ö','ÑÓ±ß','ÉÇβ','ÓñÁÖ','ͨ»¯','ËÄÆ½','°¢¿ËËÕ','¹ó¸Û','°×ɽ','˫Ѽɽ','ÏæÎ÷','¹þÃÜ','±£É½','ӥ̶','¿¦Ê²','ÑŰ²','ºÚºÓ','ºÍÌï','¹ÌÔ','°¢ÀÉÆÃË','Æß̨ºÓ','¼ÎÓø¹Ø']
+//for(def c : citys){
+// if(!runCitys.contains(c)){
+// def code = cityCodeMap.get(c)
+// println code +" "+ c
+// }
+//}
+
+
//
//
//
@@ -731,15 +831,26 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
// return count
//}
//
-//def findCount(cityid, sqlInstance){
-// def sql = "select count(*) as count from bigdata_community_gj where cityid='${cityid}' and status=0";
-// def count = 0
-//
-// sqlInstance.eachRow(sql,{r->
-// count = r.count
-// });
-// return count
-//}
+def findCount(cityid, sqlInstance){
+ def sql = "select count(*) as count from bigdata_community_gj where cityid='${cityid}' and status=0";
+ def count = 0
+
+ sqlInstance.eachRow(sql,{r->
+ count = r.count
+ });
+ return count
+}
+
+
+def findThirdCommCount(cityid, sqlInstance){
+ def sql = "select count(*) as count from (select count(*) from bigdata_third_party_price_gj where price_date=202209 and cityid='${cityid}' group by commid)";
+ def count = 0
+
+ sqlInstance.eachRow(sql,{r->
+ count = r.count
+ });
+ return count
+}
//
//
//
@@ -976,6 +1087,15 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
//}
+def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\¹úÐÅ´ï¼Û¸ñ-º¼ÖÝ.xlsx"
+ExcelUtils.multiThreadingModify(fileName, { d ->
+ def dist = CommonDatautils.findDistrictById(d['A'])
+ if(dist){
+ d['C'] = dist.city
+ d['D'] = dist.region
+ d['E'] = dist.name
+ }
+})
//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\0922Èë¿âÊý¾Ý.xlsx"
//def datas = ExcelUtils.read(fileName, 0, 1)
@@ -1001,27 +1121,27 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
-//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\¼ÈëÈ˹¤²é¼Û_0922_300.xlsx"
-
+//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\È˹¤Ö¸µ¼¼Û¼Èë_1020.xlsx"
+//
//ExcelUtils.multiThreadingModify(fileName, {d->
// if(d['A']){
-// def region = RegionData.formatRegion(d['A'], d['B'])
-// if(region){
-// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district")
-// if(dist){
-// d['E'] = dist.region
-// d['F'] = dist._id.toString()
-// }
-// }
-//// if(!d['Q']){
-//// def dist = CommonDatautils.findDistrictById(d['A'])
-//////
+//// def region = RegionData.formatRegion(d['A'], d['B'])
+//// if(region){
+//// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district")
//// if(dist){
-//// d['H'] = dist.region
-////// d['G'] = dist.name
-//// d['I'] = dist.status
+//// d['E'] = dist.region
+//// d['F'] = dist._id.toString()
//// }
//// }
+// if(!d['F']){
+// def dist = CommonDatautils.findDistrictById(d['A'])
+////
+// if(dist){
+//// d['H'] = dist.region
+//// d['G'] = dist.name
+// d['F'] = dist.status
+// }
+// }
//
// }
//},0)
@@ -1038,6 +1158,30 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
+//ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\¸¶.xlsx",{d->
+// def obj = CommonDatautils.findDistrict(d['D'],d['L'], d['K'], "district")
+// if(obj){
+// def count = findGuidedPrice(sqlInstance236, obj._id.toString())
+// if(count){
+// d['M'] = "´æÔÚ"
+// }
+// d['N'] = obj.name_cat
+// d['O'] = obj.estate_type2
+// }
+//
+//})
+
+def findGuidedPrice(sqlInstance, id){
+ def count = 0
+ def sql = "select count(*) as count from guided_price_gj where commid='${id}'"
+ sqlInstance.eachRow(sql,{r->
+ count = r.count
+ });
+ return count
+}
+
+
+
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy
index 6b1009e6c..295ab8915 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy
@@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap
@BatchOwner(Watcher.GaoJuan)
class ThirdPartyPriceBatch extends BaseBatch {
- def sDate= 202109//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
- def startDate = 202107
- def endDate = 202109
+ def sDate= 202211//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
+ def startDate = 202209
+ def endDate = 202211
// 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")
@@ -45,11 +45,11 @@ class ThirdPartyPriceBatch extends BaseBatch {
def citys = CcbCommonUtils.getRunningCitys(args)
def rows = []
def index = 0
- def weekend = DateUtils.getFirstDayOfWeek(new Date())
+ def weekend = DateUtils.getFirstDayOfWeek(DateUtils.parseFromTightByPattern(sDate+"15", "yyyyMMdd"))
+ def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
for(def city : citys){
index++
def statMap = getDistrictStatByCity(city, weekend)
- def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name","name_cat", "estate_type2","lng"])
@@ -502,8 +502,8 @@ class ThirdPartyPriceBatch extends BaseBatch {
def findThirdPartyPrice(def city, def statMap){
def q = new BasicDBObject()
q.put("city", city)
-
q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate))
+
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/TradeStatLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy
index c2f488b5f..e87103a90 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy
@@ -40,7 +40,7 @@ class TradeStatLog {
static main(args) {
def task = new TradeStatLog()
- task.run()//ͳ¼Æ×î½ü3¸öÔÂץȡµÄ³É½»Êý¾ÝÁ¿
+// task.run()//ͳ¼Æ×î½ü3¸öÔÂץȡµÄ³É½»Êý¾ÝÁ¿
// task.exportTrade()//µ¼³öδÈë¿â³É½»
// task.thirdPartyStat()
// println Calendar.getInstance().get(Calendar.YEAR)
@@ -50,8 +50,25 @@ class TradeStatLog {
// task.deleteDealData2()
// task.statTableCount()
// task.filterTrade()
+// task.updateDealPriceType()
+ }
+ def updateDealPriceType(){
+ def citys = CommonDatautils.findAllCity()
+ def index = 0
+ for(def c : citys){
+ DEAL_PRICE_COLL.find(new BasicDBObject("city", c)).sort(new BasicDBObject("trade_date",-1)).batchSize(5000).each {it->
+ if(it.total_price instanceof Double){
+ index ++
+ println index+" "+it.city+" "+it.total_price+" "+it._id.toString()
+
+ def udata = new BasicDBObject()
+ udata.put("total_price", (int)it.total_price)
+ DEAL_PRICE_COLL.update(new BasicDBObject("_id", it._id), new BasicDBObject('$set', udata))
+ }
+ }
+ }
}
def statTableCount(){
@@ -73,15 +90,15 @@ class TradeStatLog {
}
def run(){
- def citys = CcbCommonUtils.citys_92;
+ def citys = CcbCommonUtils.citys_all;
def rets = []
- rets << ["³ÇÊÐ","7ÔÂ×ÜÁ¿","8ÔÂ×ÜÁ¿","9ÔÂ×ÜÁ¿","Õ¼±È","±´¿Ç","Á´¼Ò", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ"]
+ rets << ["³ÇÊÐ","9ÔÂ×ÜÁ¿","10ÔÂ×ÜÁ¿","11ÔÂ×ÜÁ¿","Õ¼±È","±´¿Ç","Á´¼Ò", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ"]
def sources = ["±´¿ÇÕÒ·¿","Á´¼ÒÔÚÏß","ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐԵزú"]
//def startDate = "2021-05-01"
- def startDate = "2022-07-01"
- def date = "2022-08-01"
- def endDate = "2022-09-01"
- def newDate = "2022-10-01"
+ def startDate = "2022-09-01"
+ def date = "2022-10-01"
+ def endDate = "2022-11-01"
+ def newDate = "2022-12-01"
for(def city : citys){
def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd"))
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
new file mode 100644
index 000000000..af276a9c9
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy
@@ -0,0 +1,280 @@
+package com.fangjia.script.ccbevaluation.data
+
+import com.fangjia.script.BaseBatch
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.ccb.FileUtils
+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
+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) {
+<<<<<<< HEAD
+// sameAddr()
+ seaweedStreetUpdate()
+ }
+
+ def seaweedStreetUpdate(){
+ ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\Ð¡ÇøµØÖ·²ð·Ö\\ÒѺËʵ-·2.xlsx",{d->
+ if(d['A']){
+ def dbo = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district")
+ if(dbo){
+ def udate = new BasicDBObject()
+ def street = null
+ def address = ""
+ if(d['E']){
+ street = d['E']
+ udate.put("street", street)
+ address = street
+ }
+ def streetNum = null
+ if(d['F']){
+ streetNum = d['F']
+ udate.put("street_number", streetNum)
+ address = address + streetNum
+ }
+
+ if(dbo.address!=address){
+ udate.put("address", address)
+ }
+ if(udate){
+ udate.put("m_date", new Date())
+ DBUtils.seaweed.update(new BasicDBObject('_id', dbo.get("_id")), new BasicDBObject('$set', udate))
+ }
+
+ }
+ }
+
+ })
+=======
+// 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;
+ }
+ }
+ }
+ })
+
+
+>>>>>>> c1a5ab8c6aa973a91e6be5547ec0925db3fa500f
+ }
+
+ def sameAddr() {
+ def citys = CommonDatautils.findAllCity()
+ def dataMap = [:]
+ def index = 0
+ for (def c : citys) {
+ index++
+ def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city", "region", "name", "address"])
+
+ def addrMap = [:]
+ for (def dist : dists) {
+ if (dist.address) {
+ def rets = addrMap.get(dist.address)
+ if (!rets) {
+ rets = []
+ }
+ rets << dist
+ addrMap.put(dist.address, rets)
+ }
+ }
+ dataMap.put(c, addrMap)
+ println index +" "+c
+ }
+
+
+ def sameAddrList = []
+ for(def c : citys) {
+ def cityMap = dataMap.get(c)
+ if(cityMap){
+ cityMap.each{addr,rets->
+ if(rets && rets.size()>1){
+ def keys = new HashSet()
+ for(def d : rets){
+ if(d.name){
+ def name = d.name.replace("Ò»ÆÚ","").replace("¶þÆÚ","").replace("ÈýÆÚ","").replace("ËÄÆÚ","").replace("ÎåÆÚ","").replace("ÁùÆÚ","").replace("ÆßÆÚ","").replace("°ËÆÚ","").replace("¾ÅÆÚ","").replace("Ê®ÆÚ","").replace("Ò»Çø","").replace("¶þÇø","").replace("ÈýÇø","").replace("ËÄÇø","").replace("ÎåÇø","").replace("ÁùÇø","").replace("ÆßÇø","").replace("°ËÇø","").replace("¾ÅÇø","").replace("Ê®Çø","").replace("AÇø","").replace("BÇø","").replace("CÇø","").replace("DÇø","")
+ .replace("ʮһ½ÖÇø","").replace("Ê®¶þ½ÖÇø","").replace("Ê®Èý½ÖÇø","").replace("Ê®ËĽÖÇø","").replace("Ê®Îå½ÖÇø","").replace("Ê®Áù½ÖÇø","").replace("Ê®Æß½ÖÇø","").replace("Ê®°Ë½ÖÇø","").replace("Ê®¾Å½ÖÇø","").replace("Ò»½ÖÇø","").replace("¶þ½ÖÇø","").replace("Èý½ÖÇø","").replace("ËĽÖÇø","").replace("Îå½ÖÇø","").replace("Áù½ÖÇø","").replace("Æß½ÖÇø","").replace("°Ë½ÖÇø","").replace("¾Å½ÖÇø","").replace("Ê®½ÖÇø","")
+ .replace("¹«Ô¢","").replace("±ðÊû","").replace("ÉÌס¥","").replace("»¨Ô°","").replace("ÄÏÇø","").replace("±±Çø","").replace("¶«Çø","").replace("Î÷Çø","")
+ keys << d.region +"##"+ name
+ }
+ }
+ if(keys && keys.size()>1){
+ for(def d : rets) {
+ if (d.name) {
+ sameAddrList << [d.city, d.region, d.name, d.address]
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ //ExcelUtils.write("D:\\Êý¾Ý\\Ð¡Çø\\ͬµØÖ·Ð¡Çø.xlsx", sameAddrList, "ÏàͬµØÖ·Ð¡Çø")
+ FileUtils.batchCreateFile(sameAddrList, "D:\\Êý¾Ý\\Ð¡Çø\\ͬµØÖ·Ð¡Çø.txt", null, "utf-8", false);
+ println "Íê³É"
+ }
+
+
+ def addrCut(){
+ def citys = CommonDatautils.findAllCity()
+ def index = 0
+
+ def fileName = "/home/goojia/gj/address_split.txt"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\address_split.txt"
+ }
+ for(def c : citys) {
+ index++
+ def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city", "region", "name","address"])
+ def rets = cut(dists)
+ FileUtils.batchCreateFile(rets, fileName, null, "utf-8", true);
+ println index +" "+ c +" "+ rets.size()
+ }
+ }
+
+ def cut(rets){
+ ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20)
+ final CountDownLatch latch = new CountDownLatch(rets.size())
+ def totalCount = new AtomicLong()
+ def rows = new CopyOnWriteArrayList()
+ for(def i=0;i
+ def data = []
+ data << r.gujia_ceft_id
+ data << r.gujia_ceft_tp
+ data << r.gujia_ceft
+ data << r.gujia_seq
+ data << r.gujia_urbn
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+
+
+ def fileName = linux_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("EVALUATE_RATE", allRows, fileName, curDate, false)
+ }
+
+ def exportBigdataPoiData() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,lgt,ltt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_bigdata_poi_gj_w where urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.urbn_id
+ data << r.gujia_admndiv_id
+ data << r.gujia_fsid
+ data << r.poi_nm
+ data << r.gujia_tp
+ data << r.gujia_tp_ecd
+ data << r.lgt
+ data << r.ltt
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("BIGDATA_POI_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportBigdataDistrictData() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_lgc_admndiv_dsc,gujia_lgc_admndiv_cd,gujia_adiv_cd_val,gujia_data_tm from "+database+".t0831_bigdata_district_gj_w where urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_admndiv_id
+ data << r.gujia_admndiv_nm
+ data << r.gujia_admndiv_nm_cpa
+ data << r.urbn_id
+ data << r.gujia_natstd_cd
+ data << r.gujia_dspl_seq
+ data << r.gujia_admndiv_cgy
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ data << r.gujia_lgc_admndiv_dsc
+ data << r.gujia_lgc_admndiv_cd
+ data << r.gujia_adiv_cd_val
+ data << r.gujia_data_tm
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("BIGDATA_DISTRICT_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportWebsiteRate(){
+ def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_wgt,gujia_tp,gujia_src_co,urbn_id,gujia_urbn,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_website_config_gj_w";
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujiadatawebst_src_id
+ data << r.gujia_data_webst_src
+ data << r.gujiadatawebstmpng_id
+ data << r.gujia_wgt
+ data << r.gujia_tp
+ data << r.gujia_src_co
+ data << r.urbn_id
+ data << r.gujia_urbn
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ allRows << data
+ });
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = linux_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("WEBSITE_CONFIG_GJ", allRows, fileName, curDate, false)
+ }
+
+
+ def exportGuidedPrice() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_fsid,gujia_bds_id,comm_nm,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,to_char(gujia_drc_dt,'yyyy-mm-dd') as gujia_drc_dt,gujia_drc_prc,gujia_add_psn,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_guided_price_gj_w where urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_fsid
+ data << r.gujia_bds_id
+ data << r.comm_nm
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_admndiv_id
+ data << r.gujia_admndiv_nm
+ data << r.gujia_drc_dt
+ data << r.gujia_drc_prc
+ data << r.gujia_add_psn
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def fileName = linux_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("GUIDED_PRICE_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportCommunityGuidedPrice(def date) {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_drc_prc, gujia_drc_prc_src_val, rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_community_guide_price_gj_h where urbn_id='${cityCode}' and data_crt_tm>=to_date('${date}','yyyyMMdd')";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_fsid
+ data << r.gujia_bds_id
+ data << r.comm_nm
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_admndiv_id
+ data << r.gujia_admndiv_nm
+ data << r.gujia_drc_prc
+ data << r.gujia_drc_prc_src_val
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+
+ def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ createFileToFtp("COMMUNITY_GUIDE_PRICE_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportBigdataCommunity(){
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select urbn_id,gujia_admndiv_id,gujia_comm_id,gujia_admndiv_nm,comm_nm,gujia_dtl_adr,lgt,ltt,gujiaocpoflandtotarea,gujia_bld_tot_area,gujia_grnrate,gujia_vol_rate,gujia_park_num,gujia_bld_yr_rc,gujia_hs_use,gujia_totunits,gujia_data_tm,gujia_udt_mark_val,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_comm_tp_val,gujia_comm_fmnm,gujia_str,gujia_hsno,gujiawthr_new_pan_ind,gujia_comm_intd,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujia_src_co,gujia_vlgtwn_str_mng,gujia_lgc_admndiv_cd,gujia_lgc_adiv,gujia_bds_st_val from "+database+".t0831_bigdata_community_gj_w where urbn_id='${cityCode}' ";//where cityId in (350200,150100)
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.urbn_id
+ data << r.gujia_admndiv_id
+ data << r.gujia_comm_id
+ data << r.gujia_admndiv_nm
+ data << r.comm_nm
+ data << r.gujia_dtl_adr
+ data << r.lgt
+ data << r.ltt
+ data << r.gujiaocpoflandtotarea
+ data << r.gujia_bld_tot_area
+ data << r.gujia_grnrate
+ data << r.gujia_vol_rate
+ data << r.gujia_park_num
+ data << r.gujia_bld_yr_rc
+ data << r.gujia_hs_use
+ data << r.gujia_totunits
+ data << r.gujia_data_tm
+ data << r.gujia_udt_mark_val
+ data << r.data_udt_tm
+ data << r.gujia_comm_tp_val
+ data << r.gujia_comm_fmnm
+ data << r.gujia_str
+ data << r.gujia_hsno
+ data << r.gujiawthr_new_pan_ind
+ data << r.gujia_comm_intd
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.gujia_src_co
+ data << r.gujia_vlgtwn_str_mng
+ data << r.gujia_lgc_admndiv_cd
+ data << r.gujia_lgc_adiv
+ data << r.gujia_bds_st_val
+ allRows << data
+ });
+ }
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("BIGDATA_COMMUNITY_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportCommunityStaging() {
+
+ def allRows = []
+ def sql = "select gujia_instm_id,gujia_comm_id,gujiacomm_prim_prd_id,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_community_staging_gj_w";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_instm_id
+ data << r.gujia_comm_id
+ data << r.gujiacomm_prim_prd_id
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("COMMUNITY_STAGING_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportCommunityBuildType() {
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select urbn_id,gujia_comm_id,gujia_bld_tp_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_data_tm from "+database+".t0831_bigdata_commbuildtype_gj_w where urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.urbn_id
+ data << r.gujia_comm_id
+ data << r.gujia_bld_tp_val
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ data << r.gujia_data_tm
+ allRows << data
+ });
+ }
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("BIGDATA_COMMBUILDTYPE_GJ", allRows, fileName, curDate, false)
+ }
+
+ def exportThirdPartyPrice2(price_date, new_dists) {
+
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ 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 gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujia_avprc_dt_val,gujia_comm_avprc,gujia_comm_hgst_prc,gujia_comm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " +
+ "urbn_id='${cityCode}' and gujia_avprc_dt_val=${price_date} and gujia_admndiv_id not in ${newstr} ";
+ def rets1 = getThirdPartyDatas(sql1)
+ allRows.addAll(rets1)
+
+ def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujia_avprc_dt_val,gujia_comm_avprc,gujia_comm_hgst_prc,gujia_comm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " +
+ "urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} ";
+ def rets2 = getThirdPartyDatas(sql2)
+ allRows.addAll(rets2)
+ }else{
+ def sql = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujia_avprc_dt_val,gujia_comm_avprc,gujia_comm_hgst_prc,gujia_comm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where urbn_id='${cityCode}' and gujia_avprc_dt_val='${price_date}' ";
+ allRows = getThirdPartyDatas(sql)
+ }
+ if(allRows && allRows.size()>0){
+ index = index + 1
+ if(index==1){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ }else{
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ }
+ }
+ }
+
+ println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload(null, fileName, curDate)
+ }
+
+ def getThirdPartyDatas(def sql){
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_trdpt_avprc_id
+ data << r.urbn_id
+ data << r.gujia_admndiv_id
+ data << r.gujia_bds_id
+ data << r.comm_nm
+ data << r.gujia_dtsr_id
+ data << r.gujia_dtsr_dsc
+ data << r.gujia_avprc_dt_val
+ data << r.gujia_comm_avprc
+ data << r.gujia_comm_hgst_prc
+ data << r.gujia_comm_lwst_prc
+ data << r.data_udt_tm
+ allRows << data
+ })
+ return allRows;
+ }
+
+
+ def exportBigdataDeal(def dealDate, 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 urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " +
+ "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}"
+ def rets1 = dealData(sql1)
+
+ def sql2 = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " +
+ "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}"
+ def rets2 = dealData(sql2)
+ allRows.addAll(rets1)
+ allRows.addAll(rets2)
+ }else{
+ def sql = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " +
+ "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd')";
+ allRows.addAll(dealData(sql))
+ }
+ }
+
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat"
+ }
+ createFileToFtp("BIGDATA_DEAL_GJ", allRows, fileName, curDate, false)
+ }
+
+
+ def dealData(def sql){
+ def allRows = []
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.urbn_id
+ data << r.urbn_id
+ data << r.mdl_id
+ data << r.urbn_nm
+ data << r.gujia_admndiv_id
+ data << r.gujia_admndiv_nm
+ data << r.gujia_str
+ data << r.gujia_hsno
+ data << r.gujia_comm_id
+ data << r.comm_nm
+ data << r.gujia_bld_id
+ data << r.bld_id
+ data << r.gujia_bld_nm
+ data << r.gujia_unit_id
+ data << r.unit_id
+ data << r.gujia_unit_nm
+ data << r.gujia_acc_id
+ data << r.gujia_dtl_adr
+ data << r.gujia_bld_yr_rc
+ data << r.gujia_own_val
+ data << r.gujia_own_yrlmt_val
+ data << r.gujia_prd_val
+ data << r.gujia_wbt_floor
+ data << r.gujia_lyr_tp_val
+ data << r.gujia_tot_floor_num
+ data << r.gujia_bld_tp_val
+ data << r.gujia_bld_stc
+ data << r.gujiaconstructionarea
+ data << r.gujia_set_innr_area
+ data << r.gujia_acc_tp_val
+ data << r.gujia_room
+ data << r.gujia_dept
+ data << r.gujia_ktch_num
+ data << r.gujia_toliet
+ data << r.gujia_hs_use
+ data << r.gujia_indr_stc_val
+ data << r.gujia_twrd_val
+ data << r.gujia_dcrt_sttn
+ data << r.gujia_ases_bt_ln_num
+ data << r.gujia_trdtckt_prc
+ data << r.gujia_mdl_tot_prc
+ data << r.gujia_dcl_tot_prc
+ data << r.gujia_ases_tot_prc
+ data << r.gujiasigntonlinectrid
+ data << r.txn_dt
+ data << r.gujia_txn_tp_val
+ data << r.gujia_sell_pymtmod
+ data << r.gujia_mdl_cyc
+ data << r.gujiawthrext_lift_ind
+ data << r.gujiagvlndfargrdnarea
+ data << r.gujia_gv_lu_tbl_area
+ data << r.gujia_gv_sun_tbl_area
+ data << r.gujiagvbaywindow_area
+ data << r.gujiagvarea_tower_flr
+ data << r.gujia_gv_grg_area
+ data << r.gujiagvundgdroom_area
+ data << r.gujia_gv_othr_area
+ data << r.gujia_hs_src_dtsrc
+ data << r.intr_co_id
+ data << r.intr_co_nm
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ data << r.gujia_mkdam
+ data << r.gujia_data_tm
+ allRows << data
+ });
+ return allRows
+ }
+
+
+ def exportBigdataForsale(publishDate, new_dists){
+ def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat"
+ }
+ 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 urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_unitprc,gujia_tot_prc,gujia_sell_pymtmod,gujia_wbt_floor,gujia_tot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt_ind,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " +
+ "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and anc_tm>=to_date('${publishDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}";
+ def rets1 = getHouseDatas(sql1)
+ allRows.addAll(rets1)
+ }else{
+ def sql = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_unitprc,gujia_tot_prc,gujia_sell_pymtmod,gujia_wbt_floor,gujia_tot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt_ind,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " +
+ "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and anc_tm>=to_date('${publishDate}','yyyy-MM-dd')";
+ allRows = getHouseDatas(sql)
+ }
+ if(allRows.size()>0){
+ index = index + 1
+ if(index == 1){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ }else{
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ }
+
+ }
+ }
+
+ if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý
+ def newstr = "('"+new_dists.join("','")+"')"
+ def sql2 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_unitprc,gujia_tot_prc,gujia_sell_pymtmod,gujia_wbt_floor,gujia_tot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt_ind,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " +
+ "from "+database+".t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}"
+ def rets2 = getHouseDatas(sql2)
+ if(rets2.size()>0){
+ FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true);
+ }
+ }
+ println "BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.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.urbn_nm +" "+index
+ def data = []
+ data << r.urbn_id
+ data << r.gujia_sell_id
+ data << r.gujia_listg_hs_id
+ data << r.urbn_nm
+ data << r.gujia_admndiv_id
+ data << r.gujia_admndiv_nm
+ data << r.gujia_comm_id
+ data << r.comm_nm
+ data << r.gujia_bld_id
+ data << r.bld_id
+ data << r.gujia_bld_nm
+ data << r.gujia_unit_id
+ data << r.unit_id
+ data << r.gujia_unit_nm
+ data << r.gujia_acc_id
+ data << r.gujia_dtl_adr
+ data << r.gujia_bld_yr_rc
+ data << r.gujia_own_val
+ data << r.gujia_own_yrlmt_val
+ data << r.gujia_unitprc
+ data << r.gujia_tot_prc
+ data << r.gujia_sell_pymtmod
+ data << r.gujia_wbt_floor
+ data << r.gujia_tot_floor_num
+ data << r.gujia_bld_tp_val
+ data << r.gujia_indr_stc_val
+ data << r.gujia_bld_stc
+ data << r.gujiaconstructionarea
+ data << r.gujia_set_innr_area
+ data << r.gujia_acc_tp_val
+ data << r.gujia_room
+ data << r.gujia_dept
+ data << r.gujia_ktch_num
+ data << r.gujia_toliet
+ data << r.gujia_twrd_val
+ data << r.gujia_dcrt_sttn
+ data << r.gujiawthrext_lift_ind
+ data << r.gujiajiladderjiactval
+ data << r.anc_tm
+ data << r.exdat
+ data << r.gujia_wthr_strt_ind
+ data << r.gujia_hs_src_dtsrc
+ data << r.intr_co_id
+ data << r.intr_co_nm
+ data << r.gujia_anc_psn
+ data << r.gujia_anc_psn_tel
+ data << r.gujia_dsc_inf_cntnt
+ data << r.rmrk_dsc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ data << r.gujia_apd_inf
+ allRows << data
+// if(allRows.size()%200000==0){
+// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
+// allRows.clear()
+// }
+ });
+ return allRows
+ }
+
+
+ def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend);
+ println tableName+" Êý¾ÝÎļþÊä³öÍê³É......"
+// CcbFtpUtils.ftpUpload(null, fileName, curDate)
+// println tableName+" ÉÏ´«FtpÍê³É......"
+ }
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy
new file mode 100644
index 000000000..1508d0b9f
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy
@@ -0,0 +1,382 @@
+package com.fangjia.script.ccbevaluation.pgsql
+
+import com.fangjia.script.ccbevaluation.CcbCommonUtils
+import com.fangjia.script.ccbevaluation.CcbFtpUtils
+import com.fangjia.script.ccbevaluation.ronghe.SSHHelper
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.util.DateUtils
+import com.jcraft.jsch.ChannelSftp
+import groovy.sql.Sql
+import org.apache.commons.codec.digest.DigestUtils
+
+class ExportPgsqlEvaluationResult {
+
+ def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/postgres",
+ "postgres", "postgres", "org.postgresql.Driver")
+ def citys = null
+ def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+
+ def database = "t_app_p9pha_plda."
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
+ def linux_prefix = "/home/goojia/ccb_data/evaluation/"
+ def win_prefix = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\evaluation\\${curDate}\\"
+
+ static main(args) {
+ def task = new ExportPgsqlEvaluationResult()
+ task.run(args)
+ }
+
+ def run(args) {
+ citys = CcbCommonUtils.getRunningCitys(args)
+ def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
+
+ //¼ÆËã½á¹ûÏà¹Ø
+// exportAvmEvaluationGJNB(curMonth)
+// exportAVMEvaluationItemGJNB(curMonth)
+//
+// exportCityPrice(curMonth)
+// exportRegionPrice(curMonth)
+//
+// exportCommunityBasePrice(curMonth)
+//
+// exportCommunityPdescribeGj(curMonth)
+// exportCommCaseDetailGj(curMonth)
+//
+ def curDate = curMonth.toString()+"28"
+// Éú³ÉMD5Îļþ
+ exportMd5()
+ SSHHelper jschCommand = new SSHHelper();
+ System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
+// okÎļþ
+ exportOkFile()
+ }
+
+ def exportAvmEvaluationGJNB(yearMonth){
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_yrmo,gujia_comm_num,gujia_val_comm_num,gujia_prc_cvr_rate,gujiamnldrcprccommnum,gujia_mnl_drc_prc_pct,gujia_samp_comm_num,gujiaext_samp_clc_pct,gujianervethruncomnum,gujianervethrunclcpct,gujia_tst_case_num,gujia_tst_comm_num,gujiatst_comm_num_pct,gujia_ppe15_cvr_rate,gujia_rto_mdn,gujia_rto_lv_san_ceft,gujiamdl_tst_case_num,gujiamdl_tst_comm_num,gujiamdltstcommnumpct,gujiamdltst_ppe15_pct,gujiamdlrtolvsan_ceft,gujia_mdl_md_bit_rto,gujiatrdpttstcase_num,gujiatrdpttstcomm_num,gujiatrdpttcommnumpct,gujiatrdpttstppe15pct,gujiatrdptrolvsanceft,gujiatrdpt_md_bit_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_evaluation_gj_h where gujia_yrmo = ${yearMonth} and urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_fsid
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_yrmo
+ data << r.gujia_comm_num
+ data << r.gujia_val_comm_num
+ data << r.gujia_prc_cvr_rate
+ data << r.gujiamnldrcprccommnum
+ data << r.gujia_mnl_drc_prc_pct
+ data << r.gujia_samp_comm_num
+ data << r.gujiaext_samp_clc_pct
+ data << r.gujianervethruncomnum
+ data << r.gujianervethrunclcpct
+ data << r.gujia_tst_case_num
+ data << r.gujia_tst_comm_num
+ data << r.gujiatst_comm_num_pct
+ data << r.gujia_ppe15_cvr_rate
+ data << r.gujia_rto_mdn
+ data << r.gujia_rto_lv_san_ceft
+ data << r.gujiamdl_tst_case_num
+ data << r.gujiamdl_tst_comm_num
+ data << r.gujiamdltstcommnumpct
+ data << r.gujiamdltst_ppe15_pct
+ data << r.gujiamdlrtolvsan_ceft
+ data << r.gujia_mdl_md_bit_rto
+ data << r.gujiatrdpttstcase_num
+ data << r.gujiatrdpttstcomm_num
+ data << r.gujiatrdpttcommnumpct
+ data << r.gujiatrdpttstppe15pct
+ data << r.gujiatrdptrolvsanceft
+ data << r.gujiatrdpt_md_bit_rto
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
+ def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
+ def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
+ fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat"
+ }
+ createFileToFtp("AVM_EVALUATION_GJNB", allRows, fileName, curDate, false)
+ createFileToFtp("AVM_EVALUATION_GJ", allRows, fileName1, curDate, false)
+ }
+
+ def exportAVMEvaluationItemGJNB(yearMonth){
+
+ def allRows = []
+
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_rgon_id,gujia_rgon_nm,gujia_comm_id,gujia_comm_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_avprc,gujia_clc_tp_val,gujia_rlb,gujia_to_mkprc_mny, to_char(mdl_dt,'yyyy-mm-dd') as mdl_dt,gujia_valt_unitprc,gujia_area,gujia_dcrt_val,gujia_twrd_val,gujia_wbt_floor,gujia_tot_floor,gujia_data_tp,gujia_rto,gujia_mns_rto, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm from "+database+"avm_evaluation_item_gj_h where gujia_clc_yrmo = ${yearMonth} AND urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_fsid
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_rgon_id
+ data << r.gujia_rgon_nm
+ data << r.gujia_comm_id
+ data << r.gujia_comm_nm
+ data << r.gujia_clc_yrmo
+ data << r.gujia_clc_avprc
+ data << r.gujia_avprc
+ data << r.gujia_clc_tp_val
+ data << r.gujia_rlb
+ data << r.gujia_to_mkprc_mny
+ data << r.mdl_dt
+ data << r.gujia_valt_unitprc
+ data << r.gujia_area
+ data << r.gujia_dcrt_val
+ data << r.gujia_twrd_val
+ data << r.gujia_wbt_floor
+ data << r.gujia_tot_floor
+ data << r.gujia_data_tp
+ data << r.gujia_rto
+ data << r.gujia_mns_rto
+ data << r.data_crt_tm
+ allRows << data
+ });
+ }
+
+ def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
+ def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
+ fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat"
+ }
+
+ createFileToFtp("AVM_EVALUATION_ITEM_GJNB",allRows, fileName, curDate, false)
+ createFileToFtp("AVM_EVALUATION_ITEM_GJ",allRows, fileName1, curDate, false)
+ }
+
+ def exportCityPrice(month){
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_city_price_gj_h where gujia_clc_yrmo=${month} AND urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_trdpt_avprc_id
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_clc_yrmo
+ data << r.gujia_clc_avprc
+ data << r.gujia_urbn_avprc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+
+ def fileName = linux_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
+ }
+ createFileToFtp("CITY_PRICE_GJ",allRows, fileName, curDate, false)
+ }
+
+ def exportRegionPrice(month){
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_admndiv_id,gxda_admndiv_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_district_price_gj_h where gujia_clc_yrmo=${month} AND urbn_id='${cityCode}'";
+
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_trdpt_avprc_id
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_admndiv_id
+ data << r.gxda_admndiv_nm
+ data << r.gujia_clc_yrmo
+ data << r.gujia_clc_avprc
+ data << r.gujia_urbn_avprc
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+ def fileName = linux_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
+ }
+
+ createFileToFtp("DISTRICT_PRICE_GJ",allRows, fileName, curDate, false)
+ }
+
+ def exportCommunityBasePrice(yearMonth){
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_comm_basic_prc,gujia_clmtd_val,gujia_fwd_samp_rto,gujia_mns_grd,gujia_cfdrg,gujiaarndcommprc_crlt,gujia_cfdc_dgr_val,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where gujia_clc_yrmo=${yearMonth} AND urbn_id='${cityCode}'";
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_bss_prc_id
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.gujia_admndiv_id
+ data << r.gujia_admndiv_nm
+ data << r.gujia_bds_id
+ data << r.comm_nm
+ data << r.gujia_clc_yrmo
+ data << r.gujia_clc_avprc
+ data << r.gujia_comm_basic_prc
+ data << r.gujia_clmtd_val
+ data << r.gujia_fwd_samp_rto
+ data << r.gujia_mns_grd
+ data << r.gujia_cfdrg
+ data << r.gujiaarndcommprc_crlt
+ data << r.gujia_cfdc_dgr_val
+ data << r.data_crt_tm
+ data << r.data_udt_tm
+ data << r.gujia_src_co
+ allRows << data
+ });
+ }
+
+ def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
+ def fileName1 = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
+ fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
+ }
+ createFileToFtp("COMMUNITY_BASE_PRICE_GJNB",allRows, fileName, curDate, false)
+ createFileToFtp("COMMUNITY_BASE_PRICE_GJ",allRows, fileName1, curDate, false)
+ }
+
+ def exportCommunityPdescribeGj(month){
+
+ def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
+ }
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bss_prc,gujia_cfdc_dgr_grd,gujiart3mlistgcasenum,gujialistgcaselwstprc,gujialistgcase_md_val,gujia_listg_case_avg,gujialistgcasemax_prc,gujiaavprc_crpnd_s_mo,gujiaavgwithminvalavg,gujiaavgwithmaxvalavg,gujia_rel_err,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujia_lmth_bss_prc,gujia_wthr_mnl_ind,gujia_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujianervethruntw_prc,gujia_prc_src,gujiaabtjanlcmdbitval,gujiaabtjanligcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujia_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujia_idxn_mo_moonmo,gujiaabt1yiminmmoonmo,gujia_idxn_yr_moonmo,gujiaabt1yr_samp_scvl,gujiaarnd1kscommavprc from "+database+"avm_community_p_describe_gj_h where gujiaavprc_crpnd_s_mo=${month} AND urbn_id='${cityCode}'";
+
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.gujia_fsid
+ data << r.gujia_comm_id
+ data << r.urbn_id
+ data << r.urbn_nm
+ data << r.admndiv_ecd
+ data << r.gujia_admndiv_nm
+ data << r.comm_nm
+ data << r.gujia_als_dsc
+ data << r.gujia_bss_prc
+ data << r.gujia_cfdc_dgr_grd
+ data << r.gujiart3mlistgcasenum
+ data << r.gujialistgcaselwstprc
+ data << r.gujialistgcase_md_val
+ data << r.gujia_listg_case_avg
+ data << r.gujialistgcasemax_prc
+ data << r.gujiaavprc_crpnd_s_mo
+ data << r.gujiaavgwithminvalavg
+ data << r.gujiaavgwithmaxvalavg
+ data << r.gujia_rel_err
+ data << r.gujia_dvtdgr_dsc
+ data << r.gujia_als_prc_rng
+ data << r.gujiaprcminandmax_rng
+ data << r.gujia_dsc
+ data << r.gujia_lmth_bss_prc
+ data << r.gujia_wthr_mnl_ind
+ data << r.gujia_lmth_fnl_prc
+ data << r.data_crt_tm
+ data << r.gujianervethruntw_prc
+ data << r.gujia_prc_src
+ data << r.gujiaabtjanlcmdbitval
+ data << r.gujiaabtjanligcaseavg
+ data << r.gujia_indx_lbl
+ data << r.gujia_prim_pty_tp
+ data << r.gujia_comm_tp_val
+ data << r.gujia_ltst_mdl_prc
+ data << r.gujia_ltst_mdl_dt
+ data << r.gujia_idxn_mo_moonmo
+ data << r.gujiaabt1yiminmmoonmo
+ data << r.gujia_idxn_yr_moonmo
+ data << r.gujiaabt1yr_samp_scvl
+ data << r.gujiaarnd1kscommavprc
+ allRows << data
+ });
+ }
+ createFileToFtp("community_p_describe_gj",allRows, fileName, curDate, false)
+ }
+
+ def exportCommCaseDetailGj(month){
+ def fileName = linux_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
+ }
+ for(def city : citys){
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select gujia_fsid, urbn_id, gujia_comm_id, gujia_case_id,crterm,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm from "+database+"avm_comm_case_detail_gj_h where urbn_id='${cityCode}' and crterm=${month}";
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.gujia_fsid
+ data << r.urbn_id
+ data << r.gujia_comm_id
+ data << r.gujia_case_id
+ data << r.crterm
+ data << r.data_crt_tm
+ allRows << data
+ if(allRows.size()%200000==0){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ allRows.clear()
+ }
+ });
+ if(allRows.size()>0){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ }
+ }
+ CcbFtpUtils.ftpUpload(null, fileName, curDate)
+ }
+
+ def exportMd5(){
+ Vector files = CcbFtpUtils.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() +":"+ DigestUtils.md5Hex(file.getFilename())
+ }
+ }
+ def fileName = linux_prefix + "md5.txt"
+ if(CommonDatautils.isWindow()){
+ fileName = win_prefix + "md5.txt"
+ }
+ createFileToFtp("md5.txt",fileRows, fileName, curDate, false)
+ }
+
+
+ def exportOkFile(){
+ def dataCodeFileName = linux_prefix + "${curDate}.ok"
+ if(CommonDatautils.isWindow()){
+ dataCodeFileName = win_prefix + "${curDate}.ok"
+ }
+ createFileToFtp("ok txt", [], dataCodeFileName, curDate, false)
+ }
+
+
+ def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend);
+ println tableName+" Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload(null, fileName, curDate)
+// println tableName+" ÉÏ´«FtpÍê³É......"
+ }
+
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy
new file mode 100644
index 000000000..8d3d01341
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy
@@ -0,0 +1,14 @@
+package com.fangjia.script.ccbevaluation.pgsql
+
+class ExportPgsqlRonghe {
+
+ static main(args) {
+ def task = new ExportPgsqlRonghe()
+ task.run(args)
+ }
+
+ def run(args) {
+
+ }
+
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy
new file mode 100644
index 000000000..90a46050c
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy
@@ -0,0 +1,629 @@
+package com.fangjia.script.ccbevaluation.ronghe
+
+import com.fangjia.script.BaseBatch
+import com.fangjia.script.ccbevaluation.CcbCommonUtils
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.common.DataHandleUtils
+import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.util.DateUtils
+import com.fangjia.script.util.ElasticUtils
+import com.mongodb.BasicDBObject
+import com.mongodb.DBObject
+import org.apache.commons.lang.StringUtils
+import org.elasticsearch.index.query.BoolQueryBuilder
+import org.elasticsearch.index.query.QueryBuilder
+import org.elasticsearch.index.query.QueryBuilders
+
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicLong
+
+class BigdataCitypriceBatch extends BaseBatch{
+
+ public static final String[] TAGS = ["¶À¶°", "ÁªÅÅ", "µþ¼Ó", "˫ƴ", "»¨Ô°Ãæ»ý", "Ó¾³Ø", "±ðÊû", "´ø»¨Ô°", "Ñó·¿", "µþÆ´", "¶ÀÔº", "ÁªÌå", "΢Êû", "´óƽÊû"];
+
+ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80)
+
+ static main(args) {
+ runBatch(new BigdataCitypriceBatch(), args)
+ }
+
+ @Override
+ void process(Object args) {
+ def citys = CcbCommonUtils.getRunningCitys(args)
+ def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
+ def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
+ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+
+ cityRun(citys, startDate, endDate, cityCodeDataMap)
+ regionRun(citys, startDate, endDate, cityCodeDataMap)
+ districtRun(citys, startDate, endDate, cityCodeDataMap)
+ }
+
+ def cityRun(citys, startDate, endDate, cityCodeDataMap){
+ def rets = []
+ def index = 0
+ for(def city : citys){
+ index ++
+ def row = createDatas(city, null, startDate, endDate, cityCodeDataMap, null)
+ if(row){
+ rets << row
+ }
+ println "[ ${index} ]"+city+" Íê³É "
+ }
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10";
+ def fileName = "/ccb/MODEL_000000_000000_BIGDATA_CITYPRICE.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_CITYPRICE.dat"
+ }
+ def headers = []
+ FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false);
+ println "BIGDATA_CITYPRICE Êý¾ÝÎļþÊä³öÍê³É......"
+ }
+
+
+ def regionRun(citys, startDate, endDate, cityCodeDataMap){
+ def regionDatas = []
+ for(def c : citys) {
+ def regionMap = CcbCommonUtils.findAllDistrictCodeValue(c)
+ regionMap.each{region, regionCodeDataMap->
+ regionDatas << [c, region, regionCodeDataMap]
+ }
+ }
+
+ def rets = new CopyOnWriteArrayList()
+ def size = regionDatas.size()
+ final CountDownLatch latch = new CountDownLatch(size)
+ def totalCount = new AtomicLong()
+ for(def i = 0;i3){
+ sell_avg_price = avgValue(sellMap.avg_price)
+ sell_avg_area = avgValue(sellMap.area)
+ sell_avg_total = avgValue(sellMap.total_price)
+ }else{
+ sell_count = 0
+ sellDataType = null
+ }
+ }
+
+ def rent_avg_price = null
+ def rent_avg_area = null
+ def rent_avg_total = null
+ def rentStartDate = null
+ def rent_count = 0
+ def rentMap = findHouses(dist.city, dist.region, "rent", startDate, endDate, dist.name, dist.alias, dist.estate_type2)
+ if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){
+ rentDataType = 3
+ rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
+ rentMap = findHouses(dist.city, dist.region, "rent", rentStartDate, endDate, dist.name, dist.alias, dist.estate_type2)
+ if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){
+ rentDataType = 6
+ rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
+ rentMap = findHouses(dist.city, dist.region, "rent", rentStartDate, endDate, dist.name, dist.alias, dist.estate_type2)
+ }
+ }
+ if(rentMap){
+ rent_count = rentMap.avg_price.size()
+ if(rent_count>3){
+ rent_avg_price = avgValue(rentMap.avg_price)
+ rent_avg_area = avgValue(rentMap.area)
+ rent_avg_total = avgValue(rentMap.total_price)
+ }else{
+ rent_count = 0
+ rentDataType = null
+ }
+ }
+ if(!sell_avg_price){
+ sell_avg_price = allPriceMap.get(dist.city +"##"+ dist.region +"##"+ dist.name)
+ }
+ if(!rent_avg_price){
+ rent_avg_price = allRentMap.get(dist.city +"##"+ dist.region +"##"+ dist.name)
+ }
+ if (sell_avg_price || rent_avg_price) {
+ def row = []
+ row << cityCodeDataMap.get(dist.city)
+ row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
+ row << dist._id.toString()
+
+ if (sell_avg_price) {
+ row << sell_avg_price.toInteger()
+ } else {
+ row << ''
+ }
+ row << sell_count
+
+ if (rent_avg_price) {
+ row << DataHandleUtils.getDoubleRound(2, rent_avg_price)
+ } else {
+ row << ''
+ }
+ row << rent_count
+
+ row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
+
+ if (sell_avg_area) {
+ row << DataHandleUtils.getDoubleRound(2, sell_avg_area)
+ } else {
+ row << ''
+ }
+
+ if (rent_avg_area) {
+ row << DataHandleUtils.getDoubleRound(2, rent_avg_area)
+ } else {
+ row << ''
+ }
+
+ if (sell_avg_total) {
+ row << DataHandleUtils.getDoubleRound(2, sell_avg_total)
+ } else {
+ row << ''
+ }
+
+ if (rent_avg_total) {
+ row << DataHandleUtils.getDoubleRound(2, rent_avg_total)
+ } else {
+ row << ''
+ }
+ if(dist.estate_type2 && dist.estate_type2=="ÉÌס"){
+ row << '11'
+ }else{
+ row << '13'
+ }
+
+ if(sellDataType){
+ row << sellDataType
+ }else{
+ row << ''
+ }
+
+ if(rentDataType){
+ row << rentDataType
+ }else{
+ row << ''
+ }
+
+ row << 1
+ row << 'FJW'
+ return row
+ }
+ return null
+ }
+
+
+ def createDatas(city, region , startDate, endDate, cityCodeDataMap, regionCodeDataMap) {
+ def sellDataType = 1
+ def rentDataType = 1
+ def sell_count = findHouseCountByType(city, region, "sell", startDate, endDate)
+ def sell_avg_price = null
+ def sell_avg_area = null
+ def sell_avg_total = null
+ def sellStartDate = null
+ if (sell_count < 10) {
+ sellDataType = 3
+ sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
+ sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate)
+ if (sell_count < 10) {
+ sellDataType = 6
+ sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
+ sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate)
+ }
+ } else {
+ sellStartDate = startDate
+ }
+ if (sell_count) {
+ sell_avg_price = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"avg_price")
+ sell_avg_area = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"area")
+ sell_avg_total = findHouseAvgByType(city, region, "sell", sellStartDate, endDate, "total_price")
+ }
+
+
+ def rentStartDate = null
+ def rent_count = findHouseCountByType(city, region, "rent", startDate, endDate)
+ if (rent_count < 10) {
+ rentDataType = 3
+ rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
+ rent_count = findHouseCountByType(city, region, "sell", startDate, endDate)
+ if (rent_count < 10) {
+ rentDataType = 6
+ rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
+ rent_count = findHouseCountByType(city, region, "sell", rentStartDate, endDate)
+ }
+ } else {
+ rentStartDate = startDate
+ }
+
+ def rent_avg_price = null
+ def rent_avg_area = null
+ def rent_avg_total = null
+ if (rent_count>=10) {
+ rent_avg_price = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "avg_price")
+ rent_avg_area = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "area")
+ rent_avg_total = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "total_price")
+ }
+
+ println city +" "+region +" sell: "+ sell_count +" rent: "+rent_count
+
+ if (sell_avg_price || rent_avg_price) {
+ def row = []
+ row << cityCodeDataMap.get(city)
+ row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
+
+ if(region){
+ row << regionCodeDataMap.district_code
+ }
+
+ if (sell_avg_price) {
+ row << sell_avg_price.toInteger()
+ } else {
+ row << ''
+ }
+
+ if (rent_avg_price) {
+ row << DataHandleUtils.getDoubleRound(2, rent_avg_price)
+ } else {
+ row << ''
+ }
+
+ row << sell_count
+ row << rent_count
+ row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
+ row << '11'
+
+ if (sell_avg_area) {
+ row << DataHandleUtils.getDoubleRound(2, sell_avg_area)
+ } else {
+ row << ''
+ }
+
+ if (rent_avg_area) {
+ row << DataHandleUtils.getDoubleRound(2, rent_avg_area)
+ } else {
+ row << ''
+ }
+
+ if (sell_avg_total) {
+ row << DataHandleUtils.getDoubleRound(2, sell_avg_total)
+ } else {
+ row << ''
+ }
+
+ if (rent_avg_total) {
+ row << DataHandleUtils.getDoubleRound(2, rent_avg_total)
+ } else {
+ row << ''
+ }
+
+ row << 1
+ row << sellDataType
+ row << rentDataType
+ row << 'FJW'
+ return row
+ }
+
+ return null
+ }
+
+
+ def avgValue(def datas){
+ def avgValue = null
+ if(datas){
+ avgValue = datas.sum()/datas.size()
+ }
+ return avgValue;
+ }
+
+ def findHouseAvgByType(def city, def region, def cat, def startDate, def endDate, def type){
+ String sql = "select avg(${type}) as avg_val from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} "
+ if(region){
+ sql = sql +" and region='${region}'"
+ }
+ def val = null
+ ElasticUtils.executeSqlQuery(sql, { d ->
+ val = d.avg_val
+ })
+ return val;
+ }
+
+ def findHouseCountByType(def city, def region, def cat, def startDate, def endDate){
+ String sql = "select count(1) as count from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} "
+ if(region){
+ sql = sql +" and region='${region}'"
+ }
+ def val = null
+ ElasticUtils.executeSqlQuery(sql, { d ->
+ val = d.count
+ })
+ return val;
+ }
+
+ def findHouseDetail(def city, def region, def cat, def startDate, def endDate, def estate_type2){
+
+ String sql = "select estate_type,area,avg_price,total_price,name,height,room c from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} "
+ if(region){
+ sql = sql +" and region='${region}'"
+ }
+ def avgPrices = []
+ def areas = []
+ def totalPrices = []
+ ElasticUtils.executeSqlQuery(sql,{ seawater->
+ def flag = true
+ if(estate_type2 && estate_type2=="ÆÕͨסլ"){
+ if(seawater.estate_type && (seawater.estate_type.contains("ÉÌס") || seawater.estate_type.contains("ÉÌÒµ") || seawater.estate_type.contains("ÉÌÎñ"))){
+ flag = false
+ }
+
+ if(seawater.estate_type&& seawater.estate_type.contains("±ðÊû")){
+ flag = false
+ }
+
+ def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
+ if(vallaFlag){
+ flag = false
+ }
+ }
+ if(cat == "rent"){
+ if(seawater.avg_price && seawater.avg_price>1000){
+ flag = false
+ }
+
+ if(seawater.avg_price && seawater.avg_price<10){
+ flag = false
+ }
+ }
+ if(flag){
+ avgPrices << seawater.avg_price
+ areas << seawater.area
+ totalPrices << seawater.total_price
+ }
+ })
+ def retMap = [:]
+ if(areas){
+ retMap.avg_price = avgPrices
+ retMap.area = areas
+ retMap.total_price = totalPrices
+ }
+ return retMap;
+ }
+
+
+
+ def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){
+
+ QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(true).includeUpper(true);
+ QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false);
+
+ QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city))
+ .must(QueryBuilders.termQuery("cat", cat)).must(date_range).must(area_range)
+
+ if(region){
+ queryBuilder.must(QueryBuilders.termQuery("region", region))
+ }
+
+ if(name || alias){
+ if(!alias){
+ alias = []
+ }
+ if(!alias.contains(name)){
+ alias.add(name)
+ }
+
+ if(name.contains("ÅªÐ¡Çø")){
+ def newName = name.replace("ÅªÐ¡Çø","Ū")
+ if(!alias.contains(newName)){
+ alias << newName
+ }
+ }
+
+ if(alias && alias.size()>0){
+ BoolQueryBuilder inBuilder = QueryBuilders.boolQuery();
+ for(def s : alias){
+ inBuilder.should(QueryBuilders.matchQuery("district_name", s));
+ }
+ queryBuilder.must(inBuilder)
+ }
+ }
+
+ def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
+
+ def avgPrices = []
+ def areas = []
+ def totalPrices = []
+
+ if(houses){
+ for (int k=0;k1000){
+ continue
+ }
+
+ if(seawater.avg_price && seawater.avg_price<10){
+ continue
+ }
+ }
+ avgPrices << seawater.avg_price
+ areas << seawater.area
+ totalPrices << seawater.total_price
+ }
+ }
+
+ def retMap = [:]
+ if(areas){
+ retMap.avg_price = avgPrices
+ retMap.area = areas
+ retMap.total_price = totalPrices
+ }
+ return retMap;
+ }
+
+ /**
+ * ÊÇ·ñÊDZðÊû
+ * @return
+ */
+ public boolean isVilla(area, name, height, room) {
+ if (area == null) {
+ return false;
+ }
+ if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) {
+ return true;
+ }
+
+ boolean ret = false;
+ if (height != null && room != null) {
+ if (height <= 3) {
+ if (area > 200 && room >= 5) {
+ ret = true;
+ }
+ }
+ } else if (height == null && room != null) {
+ if (area > 360 && room >= 6) {
+ ret = true;
+ }
+ } else if (height == null && room == null) {
+ if (area > 500) {
+ ret = true;
+ }
+ }
+
+ return ret;
+ }
+
+
+
+
+
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy
index b8116db22..d2ad41623 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy
@@ -31,7 +31,6 @@ class BigdataCommunityGJRHBatch extends BaseBatch {
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80)
-
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
@@ -42,7 +41,8 @@ class BigdataCommunityGJRHBatch extends BaseBatch {
@Override
public void process(Object args) {
- def citys = CcbCommonUtils.citys_all;
+ def citys = CcbCommonUtils.getRunningCitys(args)
+
def rows = []
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
// for (def city : citys) {
@@ -53,62 +53,62 @@ class BigdataCommunityGJRHBatch extends BaseBatch {
// })
// }
- addBigdataDistrictFJW()
+// addBigdataDistrictFJW()
-// def citySeqnoMap = CcbCommonUtils.findDistrictSeqno();
+ def citySeqnoMap = CcbCommonUtils.findDistrictSeqno();
+
+ def index = 0
+ for (def city : citys) {
+ index++
+ def districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
//
-// def index = 0
-// for (def city : citys) {
-// index++
-// def districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
-////
-//// for(int i=0;i<10;i++){
-//// if(districts.size()==0){
-//// Thread.sleep(1000*60)
-//// districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
-//// }else{
-//// break
-//// }
-//// }
-//
-// def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge"])
-//
-// for(def dist : districts){
-// def obj = distMap.get(dist.commid)//CommonDatautils.findDistrictFieldById(dist.commid,["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"])
-// if(obj){
-// if(obj.alias && obj.alias.size()>0){
-// dist.commalias = obj.alias.get(0)
-// }else{
-// dist.commalias = ""
-// }
-// dist.buildstru = CcbCodeUtils.getBuildStructureCode(obj.build_structure)
-// dist.housetype = CcbCodeUtils.getDistHouseTypeCode(obj.estate_type2)
-// dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date);
-// dist.houseuse = "11"
-// dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type)
-// dist.compid = new ObjectId() //ÎïÒµ¹«Ë¾id
-// dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2)
+// for(int i=0;i<10;i++){
+// if(districts.size()==0){
+// Thread.sleep(1000*60)
+// districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
+// }else{
+// break
// }
// }
-// println index +" "+city +" Ð¡Çø¼ÓÔØÍê³É "+districts.size()
-// addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city))
-// println index +" "+city +" 1.Ð¡Çø±íÍê³É"
-// addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city))
-// println index +" "+city +" 2.Ð¡Çø½¨Öþ½á¹¹±í"
-// addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city))
-// println index +" "+city +" 3.Ð¡Çø·¿ÎÝÀàÐͱí"
-// addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city))
-// println index +" "+city +" 4.Ð¡Çø½¨ÖþÄê´ú±í"
-// addBigdataCommfeeGj(districts, cityCodeDataMap.get(city))
-// println index +" "+city +" 5.Ð¡Çø·ÑÓñí"
-// addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city))
-// println index +" "+city +" 6.Ð¡Çø·¿ÎÝÓÃ;±í"
-// addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap)
-// println index +" "+ city + " 7.µØÀíλÖñí"
-//
-//// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//Ð޸ijɽ»¼Ç¼housestyle Ò»¶¨ÒªÔËÐÐ
-//
-// }
+
+ def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge"])
+
+ for(def dist : districts){
+ def obj = distMap.get(dist.commid)//CommonDatautils.findDistrictFieldById(dist.commid,["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"])
+ if(obj){
+ if(obj.alias && obj.alias.size()>0){
+ dist.commalias = obj.alias.get(0)
+ }else{
+ dist.commalias = ""
+ }
+ dist.buildstru = CcbCodeUtils.getBuildStructureCode(obj.build_structure)
+ dist.housetype = CcbCodeUtils.getDistHouseTypeCode(obj.estate_type2)
+ dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date);
+ dist.houseuse = CcbCodeUtils.getUseTypeCode(obj.estate_type2)//"11"
+ dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type)
+ dist.compid = new ObjectId() //ÎïÒµ¹«Ë¾id
+ dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2)
+ }
+ }
+ println index +" "+city +" Ð¡Çø¼ÓÔØÍê³É "+districts.size()
+ addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city))
+ println index +" "+city +" 1.Ð¡Çø±íÍê³É"
+ addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city))
+ println index +" "+city +" 2.Ð¡Çø½¨Öþ½á¹¹±í"
+ addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city))
+ println index +" "+city +" 3.Ð¡Çø·¿ÎÝÀàÐͱí"
+ addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city))
+ println index +" "+city +" 4.Ð¡Çø½¨ÖþÄê´ú±í"
+ addBigdataCommfeeGj(districts, cityCodeDataMap.get(city))
+ println index +" "+city +" 5.Ð¡Çø·ÑÓñí"
+ addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city))
+ println index +" "+city +" 6.Ð¡Çø·¿ÎÝÓÃ;±í"
+ addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap)
+ println index +" "+ city + " 7.µØÀíλÖñí"
+
+// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//Ð޸ijɽ»¼Ç¼housestyle Ò»¶¨ÒªÔËÐÐ
+
+ }
}
def addBigdataCommunityGJRH(def districts, def cityid){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy
index 386f96f4b..892bd5e6c 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy
@@ -4,10 +4,12 @@ import com.fangjia.script.BaseBatch
import com.fangjia.script.BatchOwner
import com.fangjia.script.Watcher
import com.fangjia.script.ccbevaluation.CcbCommonUtils
+import com.fangjia.script.ccbevaluation.CcbFtpTestUtils
import com.fangjia.script.ccbevaluation.CcbFtpUtils
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.gj.ccb.FileUtils
import com.fangjia.script.util.DateUtils
+import com.jcraft.jsch.ChannelSftp
import groovy.sql.Sql
import java.sql.ResultSet
@@ -28,10 +30,11 @@ class ExportDistrictRongHe extends BaseBatch{
@Override
void process(Object args) {
citys = CcbCommonUtils.getRunningCitys(args)
+ def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
def new_dists = []//["350604","350605","410307","410308","450181"]
- //按天导(�天一个文件夹)
- exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists)
+ //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£©
+ exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists)
if(curDate.toString().endsWith("10")){
exportBigdataCommunityGJRH()//
@@ -49,6 +52,19 @@ class ExportDistrictRongHe extends BaseBatch{
exportBigdataBuildprojFjw()
exportBigdataCommlayoutpicFjw()
exportEvaluateRate()
+
+// //ÒòΪÈÚºÏÔݲ»Çп⣬ËùÒÔÐèÒª¼Ó´«Ò»ÕŵÚÈý·½¾ù¼Û±íµ½ÈÚºÏÖУ¬ ´Ó1ÔÂ10ÈÕ¿ªÊ¼´«Êä
+ def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"));
+ exportThirdPartyPrice2(thirdPartyMonth, new_dists)
+
+
+ //1ÔÂ10ÈÕ ÐÂÔö5ÕÅ±í£¬µ¼92³Ç£¬ÔöÁ¿Êý¾Ý£¬2ÔÂ10ÈÕµ¼344³Ç£¬ÆäÖÐ252³ÇËùÓÐÀúÊ·Êý¾Ý£¬92³ÇÔöÁ¿£¬3Ôºó¿ÉÄܲ»ÓÃÌṩÊý¾Ý
+ exportCommunityBasePrice(lastMonth)
+ exportCommunityPdescribeGj(lastMonth)
+ exportGuideStatistics(lastMonth)
+ exportBigdataSupplierStatistics(lastMonth)
+ exportBigdataModelingBase(lastMonth)
+
}
SSHHelper jschCommand = new SSHHelper();
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
@@ -63,14 +79,14 @@ class ExportDistrictRongHe extends BaseBatch{
// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
//
//
-//// //检查ok文件是å�¦ä¸Šä¼
+//// //¼ì²éokÎļþÊÇ·ñÉÏ´«
//// exportAllBigdataDealFJW()
//// for(def city : citys) {
//// def cityCode = cityCodeDataMap.get(city)
////
-// //按天导(一个文件夹下)
+// //°´Ììµ¼(Ò»¸öÎļþ¼ÐÏÂ)
// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
-// //按天导(�天一个文件夹)
+// //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£©
// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
//
//// exportBigdataCommunityGJRH(cityCode)
@@ -103,7 +119,7 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
}
def index = 0
for(def city : citys){
@@ -145,9 +161,9 @@ class ExportDistrictRongHe extends BaseBatch{
}
}
- println "BIGDATA_COMMUNITY_FJW 数�文件输出完�......"
+ println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......"
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_COMMUNITY_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMUNITY_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataCommbuildstruGJ(){
def allRows = []
@@ -170,11 +186,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_COMMBUILDSTRU_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataCommhousetypeGJ(){
@@ -199,11 +215,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_COMMHOUSETYPE_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMHOUSETYPE_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataCommbuildyearGj(){
@@ -227,11 +243,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
- println "BIGDATA_COMMBUILDYEAR_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMBUILDYEAR_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataCommfeeGj(){
@@ -265,11 +281,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_COMMFEE_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMFEE_FJW ÉÏ´«FtpÍê³É......"
}
@@ -295,11 +311,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_COMMHOUSEUSE_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMHOUSEUSE_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataPositionGJ(){
@@ -328,11 +344,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_POSITION_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_POSITION_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataDistrictFJW(){
@@ -360,11 +376,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
- println "BIGDATA_DISTRICT_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_DISTRICT_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataAliasFJW(){
@@ -395,11 +411,11 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "ADDRESS_ALIAS_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "ADDRESS_ALIAS_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataDealFJW(dealdate){
@@ -419,7 +435,7 @@ class ExportDistrictRongHe extends BaseBatch{
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
}
def allRows = []
@@ -504,7 +520,7 @@ class ExportDistrictRongHe extends BaseBatch{
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
- println "BIGDATA_DEAL_FJW ä¸Šä¼ Ftp完æˆ�......${curStartStr}"
+ println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${curStartStr}"
def curEndStr = DateUtils.add(curStartStr, 1)
curStartDateStr = curEndStr
}
@@ -519,14 +535,14 @@ class ExportDistrictRongHe extends BaseBatch{
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
}
def allRows = []
for(def city : citys) {
def cityCode = cityCodeMap.get(city)
- if(curDate.toString().endsWith("28")){
+ if(curDate.toString().endsWith("10")){
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, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " +
@@ -541,14 +557,14 @@ class ExportDistrictRongHe extends BaseBatch{
allRows.addAll(rets2)
}else{
def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//
- allRows = createDeal(sql)
+ allRows.addAll(createDeal(sql))
}
}
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_DEAL_FJW ä¸Šä¼ Ftp完æˆ�......${endDateStr}"
+ println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}"
}
def createDeal(sql){
@@ -709,10 +725,10 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
- println "BIGDATA_DEAL_FJW 导出完�......"
+ println "BIGDATA_DEAL_FJW µ¼³öÍê³É......"
}
@@ -720,7 +736,7 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
}
def index = 0
for(def city : citys) {
@@ -770,7 +786,7 @@ class ExportDistrictRongHe extends BaseBatch{
}
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_BUILDING_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_BUILDING_FJW ÉÏ´«FtpÍê³É......"
}
@@ -794,40 +810,355 @@ class ExportDistrictRongHe extends BaseBatch{
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "EVALUATE_RATE_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "EVALUATE_RATE_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportThirdPartyPrice2(price_date, new_dists) {
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10";
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
+ if (CommonDatautils.isWindow()) {
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_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 price_date=${price_date} 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 = null
+ if(CcbCommonUtils.citys_92.contains(city)){
+ 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}' and price_date=${price_date} ";
+ }else{
+ 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 Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload('rh', 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 exportBigdataBuildprojFjw(){
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_BUILDPROJ_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_BUILDPROJ_FJW ÉÏ´«FtpÍê³É......"
}
+ def exportCommunityBasePrice(yearMonth){
+
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = null;
+ if(CcbCommonUtils.citys_92.contains(city)){
+ 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 year_month=${yearMonth} AND CITYID='${cityCode}'";
+ }else{
+ 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")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+ println "COMMUNITY_BASE_PRICE_GJNB Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload("rh", fileName, curDate)
+ println "COMMUNITY_BASE_PRICE_GJNB ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportCommunityPdescribeGj(month){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_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 = null;
+ if(CcbCommonUtils.citys_92.contains(city)){
+ 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} AND CITYID='${cityCode}'";
+ }else{
+ 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 Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload("rh", fileName, curDate)
+ println "community_p_describe_gj ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportGuideStatistics(time){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+ def allRows = []
+
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = null;
+ if(CcbCommonUtils.citys_92.contains(city)){
+ sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}' and year_month=${time}";
+ }else{
+ sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}'";
+ }
+
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.MODEL_TYPE
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.YEAR_MONTH
+ data << r.COMM_SUM_COUNT
+ data << r.COMM_COUNT
+ data << r.RATIO
+ data << r.TYPE
+ allRows << data
+ });
+ }
+ println allRows.size()
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+
+ println "guide_statistics Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload("rh", fileName, curDate)
+ println "guide_statistics ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportBigdataSupplierStatistics(time){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+ def allRows = []
+
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = null;
+ if(CcbCommonUtils.citys_92.contains(city)){
+ sql = "select CITYID,CITYNAME,YEAR_MONTH,DATA_SOURCE,THIRD_COMM_COUNT,MODEL_TYPE from BIGDATA_SUPPLIER_STATISTICS where cityid='${cityCode}' and year_month=${time}";
+ }else{
+ sql = "select CITYID,CITYNAME,YEAR_MONTH,DATA_SOURCE,THIRD_COMM_COUNT,MODEL_TYPE from BIGDATA_SUPPLIER_STATISTICS where cityid='${cityCode}'";
+ }
+
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.CITYID
+ data << r.CITYNAME
+ data << r.YEAR_MONTH
+ data << r.DATA_SOURCE
+ data << r.THIRD_COMM_COUNT
+ data << r.MODEL_TYPE
+ allRows << data
+ });
+ }
+ println allRows.size()
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+
+ println "bigdata_supplier_statistics Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload("rh", fileName, curDate)
+ println "bigdata_supplier_statistics ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataModelingBase(time){
+
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat"
+ }
+ def headers = []
+ def allRows = []
+
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = null;
+ if(CcbCommonUtils.citys_92.contains(city)){
+ sql = "select CITY_CODE,CITYNAME,YEAR_MONTH,ESTIMATE_DEAL_COUNT,ESTIMATE_COMM_COUNT,DEAL_COUNT,DEAL_COMM_COUNT,SALE_COUNT,SALE_COMM_COUNT,MODEL_TYPE,TYPE from BIGDATA_MODELING_BASE where city_code='${cityCode}' and year_month=${time}";
+ }else{
+ sql = "select CITY_CODE,CITYNAME,YEAR_MONTH,ESTIMATE_DEAL_COUNT,ESTIMATE_COMM_COUNT,DEAL_COUNT,DEAL_COMM_COUNT,SALE_COUNT,SALE_COMM_COUNT,MODEL_TYPE,TYPE from BIGDATA_MODELING_BASE where city_code='${cityCode}'";
+ }
+
+ sqlInstance.eachRow(sql, { r ->
+ def data = []
+ data << r.CITY_CODE
+ data << r.CITYNAME
+ data << r.YEAR_MONTH
+ data << r.ESTIMATE_DEAL_COUNT
+ data << r.ESTIMATE_COMM_COUNT
+ data << r.DEAL_COUNT
+ data << r.DEAL_COMM_COUNT
+ data << r.SALE_COUNT
+ data << r.SALE_COMM_COUNT
+ data << r.MODEL_TYPE
+ data << r.TYPE
+ allRows << data
+ });
+ }
+ println allRows.size()
+ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
+
+ println "bigdata_modeling_base Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpUtils.ftpUpload("rh", fileName, curDate)
+ println "bigdata_modeling_base ÉÏ´«FtpÍê³É......"
+ }
+
+
+
def exportBigdataCommlayoutpicFjw(){
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_COMMLAYOUTPIC_FJW ä¸Šä¼ Ftp完æˆ�......"
+ println "BIGDATA_COMMLAYOUTPIC_FJW ÉÏ´«FtpÍê³É......"
}
def exportOk(curDate){
// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok"
if(CommonDatautils.isWindow()){
- dataCodeFileName = "D:\\数�\\建行\\房产估值\\数�文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
+ dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
}
FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
CcbFtpUtils.ftpUpload("rh",dataCodeFileName, curDate)
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy
index 11270dab3..c274629b5 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy
@@ -5,15 +5,12 @@ import com.fangjia.script.BatchOwner
import com.fangjia.script.Watcher
import com.fangjia.script.ccbevaluation.CcbCommonUtils
import com.fangjia.script.ccbevaluation.CcbFtpTestUtils
-
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.gj.ccb.FileUtils
import com.fangjia.script.util.DateUtils
+import com.jcraft.jsch.ChannelSftp
import groovy.sql.Sql
-import java.sql.ResultSet
-import java.sql.ResultSetMetaData
-
@BatchOwner(Watcher.GaoJuan)
class ExportDistrictRongHeTest extends BaseBatch{
@@ -23,160 +20,155 @@ class ExportDistrictRongHeTest extends BaseBatch{
runBatch(new ExportDistrictRongHeTest(), args);
}
+ def citys = []
+ def cityCodeMap = CcbCommonUtils.findCityCodeValue()
+
@Override
void process(Object args) {
- def curDate = 20220310//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
- def fileName = "/ccb_rh/${curDate}"
-// if(CommonDatautils.isWindow()){
-// fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}"
+ citys = CcbCommonUtils.getRunningCitys(args)
+ def curDate = "20221210"//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
+ def new_dists = []//["350604","350605","410307","410308","450181"]
+ //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£©
+ exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists)
+
+// if(curDate.toString().endsWith("10")){
+
+ exportEvaluateRate()
+ exportBigdataBuildprojFjw()
+ exportBigdataCommlayoutpicFjw()
+
+
+ exportBigdataCommunityGJRH()//
+ exportBigdataBuildingFJW()//
+ exportBigdataCommfeeGj()//
+
+ exportBigdataCommbuildstruGJ()//
+ exportBigdataCommhousetypeGJ()//
+ exportBigdataCommbuildyearGj()//
+ exportBigdataCommhouseuseGJ()//
+ exportBigdataPositionGJ()//
+ exportBigdataDistrictFJW()//
+ exportBigdataAliasFJW()//
+
+
+ //±¾12.10ÉÏ´«10£¬11ÔÂËùÓÐÊý¾Ý£¬23Äê1ÔÂÐè¸ÄΪËùÓгÇÊа´ÈÕÆÚͬ²½Ò»ÆÚÊý¾Ý
+ def queryDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM").toInteger()
+ exportBigdataCityPrice(queryDate)
+ exportBigdataDistPrice(queryDate)
+ exportBigdataCommPrice(queryDate)
+
+ exportInOk()
+
// }
- CcbFtpTestUtils.delete(fileName)
-
- exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"))
-
- exportBigdataCommunityGJRH()
- exportBigdataBuildingFJW()
- exportBigdataCommfeeGj()
-
- exportBigdataCommbuildstruGJ()
- exportBigdataCommhousetypeGJ()
- exportBigdataCommbuildyearGj()
- exportBigdataCommhouseuseGJ()
- exportBigdataPositionGJ()
- exportBigdataDistrictFJW()
- exportBigdataAliasFJW()
-
- exportBigdataBuildprojFjw()
- exportBigdataCommlayoutpicFjw()
- exportEvaluateRate()
-
- SSHHelper jschCommand = new SSHHelper();
- System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
-
- exportOk(curDate)
+ SSHHelperTest jschCommand = new SSHHelperTest();
+ System.out.println(jschCommand.executeCommand("sh /home/ccb_ronghe/output/rh_package.sh ${curDate}"));
}
-//
-// def runByCity(){
-// def citys = CcbCommonUtils.citys;
-// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
-//
-//
-//// //¼ì²éokÎļþÊÇ·ñÉÏ´«
-//// exportAllBigdataDealFJW()
-//// for(def city : citys) {
-//// def cityCode = cityCodeDataMap.get(city)
-////
-// //°´Ììµ¼(Ò»¸öÎļþ¼ÐÏÂ)
-// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
-// //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£©
-// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
-//
-//// exportBigdataCommunityGJRH(cityCode)
-//// exportBigdataBuildingFJW(cityCode)
-//// exportBigdataCommfeeGj(cityCode)
-////
-//// exportBigdataCommbuildstruGJ(cityCode)
-//// exportBigdataCommhousetypeGJ(cityCode)
-//// exportBigdataCommbuildyearGj(cityCode)
-//// exportBigdataCommhouseuseGJ(cityCode)
-//// exportBigdataPositionGJ(cityCode)
-//// exportBigdataDistrictFJW(cityCode)
-//// exportBigdataAliasFJW(cityCode)
-////
-//// exportBigdataBuildprojFjw(cityCode)
-//// exportBigdataCommlayoutpicFjw(cityCode)
-//// }
-//// exportEvaluateRate()
-//
-////
-// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
-// SSHHelper jschCommand = new SSHHelper();
-// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
-//
-// exportOk()
-// }
- def exportBigdataCommunityGJRH(cityCode){
- def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW";// where CITYID='${cityCode}'
- def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.COMMID
- data << r.COMMNAME
- data << r.COMMALIAS
- data << r.DISTID
- data << r.STREET
- data << r.STREETNO
- data << r.ADDRESS
- data << r.LANDAREA
- data << r.BUILDAREA
- data << r.COMMTYPE
- data << r.IFNEW
- data << r.GREENINGRATE
- data << r.PLOTRATIO
- data << r.PARKINGCNT
- data << ''
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+
+ def exportBigdataCommunityGJRH(){
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
+ }
+ def index = 0
+ for(def city : citys){
+ def allRows = []
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.COMMALIAS
+ data << r.DISTID
+ data << r.STREET
+ data << r.STREETNO
+ data << r.ADDRESS
+ data << r.LANDAREA
+ data << r.BUILDAREA
+ data << r.COMMTYPE
+ data << r.IFNEW
+ data << r.GREENINGRATE
+ data << r.PLOTRATIO
+ data << r.PARKINGCNT
+ data << ''
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+
+ if(allRows && allRows.size()>0){
+ index = index + 1
+ if(index == 1){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ }else{
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ }
+ }
+
}
- FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......"
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
println "BIGDATA_COMMUNITY_FJW ÉÏ´«FtpÍê³É......"
}
def exportBigdataCommbuildstruGJ(){
- def sql = "select CITYID,COMMID,BUILDSTRU,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_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}'
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.COMMID
- data << r.BUILDSTRU
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,COMMID,BUILDSTRU,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_COMMBUILDSTRU_FJW where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.BUILDSTRU
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......"
}
- def exportBigdataCommhousetypeGJ(cityCode){
- def sql = "select CITYID,COMMID,HOUSETYPE,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_COMMHOUSETYPE_FJW";// where CITYID='${cityCode}'
+ def exportBigdataCommhousetypeGJ(){
+
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.COMMID
- data << r.HOUSETYPE
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,COMMID,HOUSETYPE,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_COMMHOUSETYPE_FJW where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.HOUSETYPE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -184,23 +176,27 @@ class ExportDistrictRongHeTest extends BaseBatch{
}
def exportBigdataCommbuildyearGj(){
- def sql = "select CITYID,COMMID,BUILDYEAR,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_COMMBUILDYEAR_FJW";// where CITYID='${cityCode}'
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.COMMID
- data << r.BUILDYEAR
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,COMMID,BUILDYEAR,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_COMMBUILDYEAR_FJW where CITYID='${cityCode}'";//
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.BUILDYEAR
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
@@ -208,33 +204,37 @@ class ExportDistrictRongHeTest extends BaseBatch{
}
def exportBigdataCommfeeGj(){
- def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,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_COMMFEE_FJW";//where CITYID='${cityCode}'
+
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.COMMID
- data << r.COMPID
- data << r.FEE
- data << r.HOUSEUSE
- if(r.BUILDTYPE){
- def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
- data << arrs[0].trim()
- }else{
- data << ''
- }
- data << r.FEETYPE
- data << r.NOTE
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+ for(def city : citys){
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,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_COMMFEE_FJW where CITYID='${cityCode}'";
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.COMPID
+ data << r.FEE
+ data << r.HOUSEUSE
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ data << r.FEETYPE
+ data << r.NOTE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -243,24 +243,28 @@ class ExportDistrictRongHeTest extends BaseBatch{
def exportBigdataCommhouseuseGJ(){
- def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,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_COMMHOUSEUSE_FJW";// where CITYID='${cityCode}'
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.COMMID
- data << r.HOUSEUSE
- data << r.HOUSECNT
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,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_COMMHOUSEUSE_FJW where CITYID='${cityCode}'";//
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.HOUSEUSE
+ data << r.HOUSECNT
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -268,28 +272,32 @@ class ExportDistrictRongHeTest extends BaseBatch{
}
def exportBigdataPositionGJ(){
- def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,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_POSITION_FJW";// where CITYID='${cityCode}'
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.OBJECTTYPE
- data << r.OBJECTID
- data << r.POSITIONTYPE
- data << r.SEQNO
- data << r.LONGITUDE
- data << r.LATITUDE
- data << r.ALTITUDE
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- allRows << data
- });
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,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_POSITION_FJW where CITYID='${cityCode}'";//
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.OBJECTTYPE
+ data << r.OBJECTID
+ data << r.POSITIONTYPE
+ data << r.SEQNO
+ data << r.LONGITUDE
+ data << r.LATITUDE
+ data << r.ALTITUDE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -297,27 +305,31 @@ class ExportDistrictRongHeTest extends BaseBatch{
}
def exportBigdataDistrictFJW(){
- 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 from BIGDATA_DISTRICT_FJW";// where CITYID='${cityCode}'
def allRows = []
- 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
- allRows << data
- });
+ 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 from BIGDATA_DISTRICT_FJW 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
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
@@ -325,30 +337,34 @@ class ExportDistrictRongHeTest extends BaseBatch{
}
def exportBigdataAliasFJW(){
- def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW";// where city_id='${cityCode}'
def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.city_id
- data << r.ca_id
- data << r.address_id
- data << r.address_name
- data << r.status
- data << r.exp_dt
- data << r.version
- data << r.is_key_name
- data << r.data_source
- data << r.description
- data << r.alias_grade
- data << r.addr_type_cd
- data << r.ifexamine
- data << r.ifdisplay
- allRows << data
- });
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW where city_id='${cityCode}'";//
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.city_id
+ data << r.ca_id
+ data << r.address_id
+ data << r.address_name
+ data << r.status
+ data << r.exp_dt
+ data << r.version
+ data << r.is_key_name
+ data << r.data_source
+ data << r.description
+ data << r.alias_grade
+ data << r.addr_type_cd
+ data << r.ifexamine
+ data << r.ifdisplay
+ allRows << data
+ });
+ }
+
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -370,9 +386,9 @@ class ExportDistrictRongHeTest extends BaseBatch{
index++
def curStartStr = curStartDateStr
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
}
def allRows = []
@@ -456,7 +472,7 @@ class ExportDistrictRongHeTest extends BaseBatch{
stop = true
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
- CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
+ CcbFtpTestUtils.ftpUpload("ccb_ronghe", fileName, curDate)
println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${curStartStr}"
def curEndStr = DateUtils.add(curStartStr, 1)
curStartDateStr = curEndStr
@@ -464,19 +480,56 @@ class ExportDistrictRongHeTest extends BaseBatch{
}
- def exportBigdataDealFJW2(curDate, dealdate){
+ def exportBigdataDealFJW2(curDate, dealdate, new_dists){
def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
}
def allRows = []
- def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and
+
+// for(def city : citys) {
+// def cityCode = cityCodeMap.get(city)
+// if(curDate.toString().endsWith("28")){
+// 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, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " +
+// "where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd') and" +
+// " distid not in ${newstr} ";//CITYID='${cityCode}' and
+// def rets1 = createDeal(sql1)
+//
+// def sql2 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " +
+// " where CITYID='${cityCode}' and distid in ${newstr}"
+// def rets2 = createDeal(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, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//
+// allRows.addAll(createDeal(sql))
+// }
+// }
+// }
+
+ for(def city : citys) {
+ if(CcbCommonUtils.citys_252.contains(city)){
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}'";
+ allRows.addAll(createDeal(sql))
+ }
+ }
+
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}"
+ }
+
+ def createDeal(sql){
+ def allRows = []
sqlInstance.eachRow(sql,{r->
def data = []
data << r.CITYID
@@ -550,9 +603,8 @@ class ExportDistrictRongHeTest extends BaseBatch{
data << r.WORKDATE
allRows << data
});
- FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
- CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
- println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}"
+
+ return allRows;
}
def exportAllBigdataDealFJW(){
@@ -632,58 +684,213 @@ class ExportDistrictRongHeTest extends BaseBatch{
allRows << data
});
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
println "BIGDATA_DEAL_FJW µ¼³öÍê³É......"
}
- def exportBigdataBuildingFJW(cityCode){
- def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW";//where CITYID='${cityCode}'
- def allRows = []
- sqlInstance.eachRow(sql,{r->
- def data = []
- data << r.CITYID
- data << r.BUILDID
- data << r.BUILDNO
- data << r.BUILDNAME
- data << r.BUILDALIAS
- data << r.DISTID
- data << r.COMMID
- data << r.BUILDYEAR
- if(r.BUILDTYPE){
- def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
- data << arrs[0].trim()
- }else{
- data << ''
- }
- data << r.BUILDSTRU
- data << r.FLOORCNT
- data << r.UNITCNT
- data << r.HOUSECNT
- data << r.IFELEVATOR
- data << r.ELEVATORCNT
- data << r.ELEVATORHOUSE
- data << r.REMARK
- data << r.CREATETIME
- data << r.UPDATETIME
- data << r.SOURCECODE
- data << r.VALID_FLAG
- allRows << data
- });
+ def exportBigdataBuildingFJW(){
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
}
- FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ def index = 0
+ for(def city : citys) {
+
+ def allRows = []
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW where CITYID='${cityCode}'";//
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.BUILDID
+ data << r.BUILDNO
+ data << r.BUILDNAME
+ data << r.BUILDALIAS
+ data << r.DISTID
+ data << r.COMMID
+ data << r.BUILDYEAR
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ data << r.BUILDSTRU
+ data << r.FLOORCNT
+ data << r.UNITCNT
+ data << r.HOUSECNT
+ data << r.IFELEVATOR
+ data << r.ELEVATORCNT
+ data << r.ELEVATORHOUSE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ data << r.VALID_FLAG
+ allRows << data
+ });
+
+ if(allRows && allRows.size()>0){
+ index = index + 1
+ if(index == 1){
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ }else{
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
+ }
+ }
+ }
+
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
println "BIGDATA_BUILDING_FJW ÉÏ´«FtpÍê³É......"
}
+ def exportBigdataCityPrice(queryDate){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat"
+ }
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ // def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE where CITYID='${cityCode}' and YMID=${queryDate}";//
+ def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE where CITYID='${cityCode}'";//
+
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.YMID
+ data << r.SALEPRICE?r.SALEPRICE:''
+ data << r.RENTPRICE?r.RENTPRICE:''
+ if(r.SALECOUNT>0) {
+ data << r.SALECOUNT
+ }else{
+ data << ''
+ }
+ if(r.RENTCOUNT>0){
+ data << r.RENTCOUNT
+ }else{
+ data << ''
+ }
+ data << r.UPDATETIME
+ data << r.HOUSEUSE
+ data << r.SALEBLDGAREA?r.SALEBLDGAREA:''
+ data << r.RENTBLDGAREA?r.RENTBLDGAREA:''
+ data << r.SALETOTALPRICE?r.SALETOTALPRICE:''
+ data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:''
+ data << r.DATATYPE
+ data << r.SDATERANGE
+ data << r.RDATERANGE
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_CITYPRICE ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportBigdataDistPrice(queryDate){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat"
+ }
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID,DISTID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_DISTPRICE where CITYID='${cityCode}'";// and YMID=${queryDate}
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.YMID
+ data << r.DISTID
+ data << r.SALEPRICE?r.SALEPRICE:''
+ data << r.RENTPRICE?r.RENTPRICE:''
+ if(r.SALECOUNT>0) {
+ data << r.SALECOUNT
+ }else{
+ data << ''
+ }
+ if(r.RENTCOUNT>0){
+ data << r.RENTCOUNT
+ }else{
+ data << ''
+ }
+ data << r.UPDATETIME
+ data << r.HOUSEUSE
+ data << r.SALEBLDGAREA?r.SALEBLDGAREA:''
+ data << r.RENTBLDGAREA?r.RENTBLDGAREA:''
+ data << r.SALETOTALPRICE?r.SALETOTALPRICE:''
+ data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:''
+ data << r.DATATYPE
+ data << r.SDATERANGE
+ data << r.RDATERANGE
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_DISTPRICE ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportBigdataCommPrice(queryDate){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat"
+ }
+ def allRows = []
+ for(def city : citys) {
+ def cityCode = cityCodeMap.get(city)
+ def sql = "select CITYID, YMID,COMMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_COMMPRICE where CITYID='${cityCode}' ";// and YMID=${queryDate}
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.YMID
+ data << r.COMMID
+ data << r.SALEPRICE?r.SALEPRICE:''
+ if(r.SALECOUNT>0) {
+ data << r.SALECOUNT
+ }else{
+ data << ''
+ }
+ data << r.RENTPRICE?r.RENTPRICE:''
+ if(r.RENTCOUNT>0){
+ data << r.RENTCOUNT
+ }else{
+ data << ''
+ }
+ data << r.UPDATETIME
+ data << r.SALEBLDGAREA?r.SALEBLDGAREA:''
+ data << r.RENTBLDGAREA?r.RENTBLDGAREA:''
+ data << r.SALETOTALPRICE?r.SALETOTALPRICE:''
+ data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:''
+ data << r.HOUSEUSE
+ data << r.SDATERANGE
+ data << r.RDATERANGE
+ data << r.DATATYPE
+ data << r.SOURCECODE
+ allRows << data
+ });
+ }
+
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMPRICE ÉÏ´«FtpÍê³É......"
+ }
+
def exportEvaluateRate(){
@@ -703,9 +910,9 @@ class ExportDistrictRongHeTest extends BaseBatch{
allRows << data
});
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -714,9 +921,9 @@ class ExportDistrictRongHeTest extends BaseBatch{
def exportBigdataBuildprojFjw(){
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
@@ -725,23 +932,35 @@ class ExportDistrictRongHeTest extends BaseBatch{
def exportBigdataCommlayoutpicFjw(){
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
- def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
+ def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
if(CommonDatautils.isWindow()){
- fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
}
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
println "BIGDATA_COMMLAYOUTPIC_FJW ÉÏ´«FtpÍê³É......"
}
- def exportOk(curDate){
-// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
- def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok"
- if(CommonDatautils.isWindow()){
- dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
+
+ def exportInOk(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ Vector files = CcbFtpTestUtils.listFileNames("rh", 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("rh", file.getFilename(), curDate)
+ }
}
- FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
- CcbFtpTestUtils.ftpUpload("rh",dataCodeFileName, curDate)
+ def fileName = "/ccb_ronghe/${curDate}/${curDate}.ok"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\${curDate}.ok"
+ }
+ FileUtils.createTxtFile(fileRows, fileName, "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
+ println "ÈÚºÏͳ¼ÆÎļþ³¤¶ÈokÎļþ ÉÏ´«FtpÍê³É......"
}
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy
new file mode 100644
index 000000000..11270dab3
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy
@@ -0,0 +1,747 @@
+package com.fangjia.script.ccbevaluation.ronghe
+
+import com.fangjia.script.BaseBatch
+import com.fangjia.script.BatchOwner
+import com.fangjia.script.Watcher
+import com.fangjia.script.ccbevaluation.CcbCommonUtils
+import com.fangjia.script.ccbevaluation.CcbFtpTestUtils
+
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.util.DateUtils
+import groovy.sql.Sql
+
+import java.sql.ResultSet
+import java.sql.ResultSetMetaData
+
+@BatchOwner(Watcher.GaoJuan)
+class ExportDistrictRongHeTest extends BaseBatch{
+
+ def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+ static main(args) {
+ runBatch(new ExportDistrictRongHeTest(), args);
+ }
+
+ @Override
+ void process(Object args) {
+ def curDate = 20220310//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
+ def fileName = "/ccb_rh/${curDate}"
+// if(CommonDatautils.isWindow()){
+// fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}"
+// }
+ CcbFtpTestUtils.delete(fileName)
+
+ exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"))
+
+ exportBigdataCommunityGJRH()
+ exportBigdataBuildingFJW()
+ exportBigdataCommfeeGj()
+
+ exportBigdataCommbuildstruGJ()
+ exportBigdataCommhousetypeGJ()
+ exportBigdataCommbuildyearGj()
+ exportBigdataCommhouseuseGJ()
+ exportBigdataPositionGJ()
+ exportBigdataDistrictFJW()
+ exportBigdataAliasFJW()
+
+ exportBigdataBuildprojFjw()
+ exportBigdataCommlayoutpicFjw()
+ exportEvaluateRate()
+
+ SSHHelper jschCommand = new SSHHelper();
+ System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
+
+ exportOk(curDate)
+
+ }
+
+//
+// def runByCity(){
+// def citys = CcbCommonUtils.citys;
+// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
+//
+//
+//// //¼ì²éokÎļþÊÇ·ñÉÏ´«
+//// exportAllBigdataDealFJW()
+//// for(def city : citys) {
+//// def cityCode = cityCodeDataMap.get(city)
+////
+// //°´Ììµ¼(Ò»¸öÎļþ¼ÐÏÂ)
+// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
+// //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£©
+// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
+//
+//// exportBigdataCommunityGJRH(cityCode)
+//// exportBigdataBuildingFJW(cityCode)
+//// exportBigdataCommfeeGj(cityCode)
+////
+//// exportBigdataCommbuildstruGJ(cityCode)
+//// exportBigdataCommhousetypeGJ(cityCode)
+//// exportBigdataCommbuildyearGj(cityCode)
+//// exportBigdataCommhouseuseGJ(cityCode)
+//// exportBigdataPositionGJ(cityCode)
+//// exportBigdataDistrictFJW(cityCode)
+//// exportBigdataAliasFJW(cityCode)
+////
+//// exportBigdataBuildprojFjw(cityCode)
+//// exportBigdataCommlayoutpicFjw(cityCode)
+//// }
+//// exportEvaluateRate()
+//
+////
+// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
+// SSHHelper jschCommand = new SSHHelper();
+// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
+//
+// exportOk()
+// }
+
+ def exportBigdataCommunityGJRH(cityCode){
+ def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.COMMNAME
+ data << r.COMMALIAS
+ data << r.DISTID
+ data << r.STREET
+ data << r.STREETNO
+ data << r.ADDRESS
+ data << r.LANDAREA
+ data << r.BUILDAREA
+ data << r.COMMTYPE
+ data << r.IFNEW
+ data << r.GREENINGRATE
+ data << r.PLOTRATIO
+ data << r.PARKINGCNT
+ data << ''
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......"
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMUNITY_FJW ÉÏ´«FtpÍê³É......"
+ }
+ def exportBigdataCommbuildstruGJ(){
+ def sql = "select CITYID,COMMID,BUILDSTRU,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_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.BUILDSTRU
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataCommhousetypeGJ(cityCode){
+ def sql = "select CITYID,COMMID,HOUSETYPE,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_COMMHOUSETYPE_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.HOUSETYPE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMHOUSETYPE_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataCommbuildyearGj(){
+ def sql = "select CITYID,COMMID,BUILDYEAR,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_COMMBUILDYEAR_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.BUILDYEAR
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
+ println "BIGDATA_COMMBUILDYEAR_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataCommfeeGj(){
+ def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,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_COMMFEE_FJW";//where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.COMPID
+ data << r.FEE
+ data << r.HOUSEUSE
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ data << r.FEETYPE
+ data << r.NOTE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMFEE_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+
+ def exportBigdataCommhouseuseGJ(){
+ def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,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_COMMHOUSEUSE_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.COMMID
+ data << r.HOUSEUSE
+ data << r.HOUSECNT
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMHOUSEUSE_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataPositionGJ(){
+ def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,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_POSITION_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.OBJECTTYPE
+ data << r.OBJECTID
+ data << r.POSITIONTYPE
+ data << r.SEQNO
+ data << r.LONGITUDE
+ data << r.LATITUDE
+ data << r.ALTITUDE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_POSITION_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataDistrictFJW(){
+ 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 from BIGDATA_DISTRICT_FJW";// where CITYID='${cityCode}'
+ def allRows = []
+ 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
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
+ println "BIGDATA_DISTRICT_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataAliasFJW(){
+ def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW";// where city_id='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.city_id
+ data << r.ca_id
+ data << r.address_id
+ data << r.address_name
+ data << r.status
+ data << r.exp_dt
+ data << r.version
+ data << r.is_key_name
+ data << r.data_source
+ data << r.description
+ data << r.alias_grade
+ data << r.addr_type_cd
+ data << r.ifexamine
+ data << r.ifdisplay
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "ADDRESS_ALIAS_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataDealFJW(dealdate){
+
+ def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
+ def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
+ def stop = false
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def index = 0
+
+ def curStartDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()),"yyyy-MM-dd")
+ def curSndDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date()),"yyyy-MM-dd")
+
+ while(!stop){
+ index++
+ def curStartStr = curStartDateStr
+
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
+ }
+
+ def allRows = []
+ if(index==1){
+ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and
+ 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
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ 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.CREATETIME1
+ data << r.UPDATETIME1
+ data << r.SOURCECODE
+ data << r.WORKDATE
+ allRows << data
+ });
+ }
+ if(curStartDateStr == curSndDateStr){
+ stop = true
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
+ println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${curStartStr}"
+ def curEndStr = DateUtils.add(curStartStr, 1)
+ curStartDateStr = curEndStr
+ }
+ }
+
+
+ def exportBigdataDealFJW2(curDate, dealdate){
+
+ def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
+ def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
+// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
+
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ }
+
+ def allRows = []
+ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and
+ 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
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ 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.CREATETIME1
+ data << r.UPDATETIME1
+ data << r.SOURCECODE
+ data << r.WORKDATE
+ allRows << data
+ });
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}"
+ }
+
+ def exportAllBigdataDealFJW(){
+ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where DEALDATE
+ 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
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ 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.CREATETIME1
+ data << r.UPDATETIME1
+ data << r.SOURCECODE
+ data << r.WORKDATE
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ println "BIGDATA_DEAL_FJW µ¼³öÍê³É......"
+ }
+
+
+ def exportBigdataBuildingFJW(cityCode){
+ def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW";//where CITYID='${cityCode}'
+ def allRows = []
+ sqlInstance.eachRow(sql,{r->
+ def data = []
+ data << r.CITYID
+ data << r.BUILDID
+ data << r.BUILDNO
+ data << r.BUILDNAME
+ data << r.BUILDALIAS
+ data << r.DISTID
+ data << r.COMMID
+ data << r.BUILDYEAR
+ if(r.BUILDTYPE){
+ def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
+ data << arrs[0].trim()
+ }else{
+ data << ''
+ }
+ data << r.BUILDSTRU
+ data << r.FLOORCNT
+ data << r.UNITCNT
+ data << r.HOUSECNT
+ data << r.IFELEVATOR
+ data << r.ELEVATORCNT
+ data << r.ELEVATORHOUSE
+ data << r.REMARK
+ data << r.CREATETIME
+ data << r.UPDATETIME
+ data << r.SOURCECODE
+ data << r.VALID_FLAG
+ allRows << data
+ });
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_BUILDING_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+
+
+ def exportEvaluateRate(){
+ 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_FJW";
+ 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")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "EVALUATE_RATE_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataBuildprojFjw(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_BUILDPROJ_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportBigdataCommlayoutpicFjw(){
+ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
+ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
+ }
+ FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
+ println "BIGDATA_COMMLAYOUTPIC_FJW ÉÏ´«FtpÍê³É......"
+ }
+
+ def exportOk(curDate){
+// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
+ def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok"
+ if(CommonDatautils.isWindow()){
+ dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
+ }
+ FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
+ CcbFtpTestUtils.ftpUpload("rh",dataCodeFileName, curDate)
+ }
+
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy
new file mode 100644
index 000000000..07d453ef7
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy
@@ -0,0 +1,112 @@
+package com.fangjia.script.ccbevaluation.ronghe
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import com.jcraft.jsch.ChannelExec;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Session
+
+import com.jcraft.jsch.*;
+
+
+class SSHHelperTest {
+
+ private Session session = null;
+ private Channel channel = null;
+
+ private String sftpHost = "192.168.0.45";
+ private int sftpPort = 17495;
+ private String sftpUserName = "ccb";
+ private String sftpPassword = "ccb!@#";
+ private int timeout = 30000;
+ /**
+ * »ñÈ¡Á¬½Ó
+ * @return
+ */
+ private ChannelExec getChannelExec() {
+ try {
+ if (channel != null && channel.isConnected()) {
+ return (ChannelExec) channel;
+ }
+ JSch jSch = new JSch();
+ if (session == null || !session.isConnected()) {
+ session = jSch.getSession(sftpUserName, sftpHost, sftpPort);
+ session.setPassword(sftpPassword);
+ Properties config = new Properties();
+ config.put("StrictHostKeyChecking", "no");
+ session.setConfig(config);
+ session.setTimeout(timeout);
+ session.connect();
+ }
+ channel = session.openChannel("exec");
+ } catch (Exception e) {
+ if (session != null) {
+ session.disconnect();
+ session = null;
+ }
+ channel = null;
+ }
+ return channel == null ? null : (ChannelExec) channel;
+ }
+
+ /**
+ * ¹Ø±ÕÁ¬½Ó
+ */
+ private void closeChannel() {
+ try {
+ if (channel != null) {
+ channel.disconnect();
+ channel = null;
+ }
+ if (session != null) {
+ session.disconnect();
+ session = null;
+ }
+ } catch (Exception e) {
+ System.out.println(e);
+ }
+ }
+
+ /**
+ * Ö´ÐзþÎñÆ÷¶ËÃüÁî
+ */
+ public boolean executeCommand(String command) {
+ boolean flag = false;
+ ChannelExec channelExec = getChannelExec();
+ if (channelExec == null) {
+ return false;
+ }
+ try {
+ channelExec.setInputStream(null);
+ channelExec.setErrStream(System.err);
+ channelExec.setCommand(command);
+
+ InputStream ins = channelExec.getInputStream();
+ channelExec.connect();
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(ins, "utf-8"));
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+
+ reader.close();
+ closeChannel();
+
+ flag = true;
+ } catch (Exception e) {
+ System.out.println(e);
+ flag = false;
+ }
+ return flag;
+ }
+
+ public static void main(String[] args) {
+ SSHHelperTest jschCommand = new SSHHelperTest();
+ System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/package.sh 20220110"));
+ }
+
+
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy
index 3be6ffa9a..c6d2373a5 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy
@@ -755,7 +755,7 @@ class CommonDatautils {
q.put("visible",0)
q.put("cat", cat);
q.put("city", city);
-// q.put("name","ºþÅϼÑÔ·")
+// q.put("name","Íò´ï»ª¸®Ò»ÆÚ")
DBObject keys = new BasicDBObject();
if(fields){
@@ -903,6 +903,36 @@ class CommonDatautils {
}
return null;
}
+
+
+ public static def findSeaweedById(String id, def filelds){
+ if(!id){
+ return null;
+ }
+ try{
+ DBObject q = new BasicDBObject();
+ q.put("_id", new ObjectId(id.toString().replace("[","").replace("]","")));
+
+ DBObject keys = new BasicDBObject();
+ filelds.each{
+ keys.put(it, 1);
+ }
+ try{
+ DSCursor cursor = getDataStoreConnection().find(q, keys);
+ if(cursor){
+ for(def obj : cursor){
+ return obj;
+ }
+ }
+ }catch(Exception e){
+ println "error_id:"+id
+ e.printStackTrace()
+ }
+ }catch(Exception e){
+
+ }
+ return null;
+ }
public static def findDistrictBySid(String sid){
@@ -1556,6 +1586,32 @@ class CommonDatautils {
}
return rets;
}
+
+
+ public static def queryDistrictStatByDate(city, startDate, endDate){
+ DBObject q = new BasicDBObject()
+ q.put("city", city);
+ q.put('weekend', new BasicDBObject('$gte', DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd")).append('$lte', DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd")));
+ def dbcursor = DIST_STAT_COLL.find(q).batchSize(5000)
+ dbcursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT)
+ def districtStatMap = [:]
+ for(def d : dbcursor){
+ def key = d.city +"##"+d.region+"##"+d.district_name
+ def prices = districtStatMap.get(key)
+ if(!prices){
+ prices = []
+ districtStatMap.put(key, prices)
+ }
+ prices << d.avg_price
+ }
+
+ def priceMap = [:]
+ districtStatMap.each{k,v->
+ def price = v.sum()/v.size()
+ priceMap.put(k, (int)price)
+ }
+ return priceMap;
+ }
public static def queryDistrictPrice(city, region, name, weekend, cat){
@@ -1646,6 +1702,22 @@ class CommonDatautils {
}
+ public static def queryHouseCalutePrice(city, region, name, startWeekendDate){
+ DBObject queryCondition = new BasicDBObject()
+ queryCondition.put("city", city);
+ queryCondition.put("region", region);
+ queryCondition.put("district_name", name);
+ queryCondition.put('weekend', new BasicDBObject('$gte', startWeekendDate));
+ queryCondition.put("value_type", new BasicDBObject('$in', [1,2]));
+ DBCursor cur = DIST_STAT_COLL.find(queryCondition).sort(new BasicDBObject().append("weekend", 1)).limit(1)
+ def dbo = null;
+ while(cur.hasNext()) {
+ dbo = cur.next()
+ }
+ return dbo;
+ }
+
+
public static def queryDistrictPriceByWeekend(city, region, name, weekend, limit){
DBObject queryCondition = new BasicDBObject()
queryCondition.put("city", city);
@@ -3290,6 +3362,20 @@ class CommonDatautils {
return count;
}
+ static def findSqmetreRentByCityAndDate(def city, def weekend){
+ def q = new BasicDBObject()
+ q.put("city", city)
+ q.put("cat","district")
+ q.put("weekend", DateUtils.parseFromTightByPattern(weekend.toString(), "yyyyMMdd"))
+ def dbcursor = SQMETRE_RENT_COLL.find(q).batchSize(2000)
+ dbcursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT)
+ def sqmetreRentMap = [:]
+ for(def d : dbcursor){
+ sqmetreRentMap.put(d.city+"##"+d.region+"##"+d.district_name, d.avg_price)
+ }
+ return sqmetreRentMap;
+ }
+
static def findNewSqmetreRent(def city, def region, def name){
def q = new BasicDBObject()
q.put("city", city)
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy
index 45f3cbe35..8d77112a6 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy
@@ -31,6 +31,8 @@ class DistrictPriceExportBatch extends BaseBatch{
public static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com")
public static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName("business", "fz_district", "mongo.db.fangjia.com")
+ static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com")
+
def specialDistsPriceMap = ["½ò̩дå7ºÅ¡¢9-17ºÅ":53620,"½ò̩дå14ºÅ":76230,"½ò̩дå1-6ºÅ¡¢8ºÅ":32580]
static main(args) {
runBatch(new DistrictPriceExportBatch(), args)
@@ -41,11 +43,9 @@ class DistrictPriceExportBatch extends BaseBatch{
def headers = ["id","comm_id","city","district","name","avg_price","year_month"]
- def ret = createDatas("¸£ÖÝ")
-
+ def ret = createNewDatas("¸£ÖÝ")
saveToDB(ret)
-
def fileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".csv"
def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512"
if(CommonDatautils.isWindow()){
@@ -98,11 +98,50 @@ class DistrictPriceExportBatch extends BaseBatch{
return rets
}
+
+ def createNewDatas(def city){
+ def districts = getFzDistricts(city)
+ def curPriceMap = findFzDistrictSellStat("¸£ÖÝ",curDate)
+ def result = []
+ for(def rMap : districts){
+ def curPrice = 0
+ def dbo = null
+ if(curPriceMap.containsKey(rMap.get("_id").toString())){
+ dbo = curPriceMap.get(rMap.get("_id").toString())
+ curPrice = dbo.avg_price
+ }else{
+ curPrice = specialDistsPriceMap.get(rMap.name)
+ if(curPrice){
+ def randMarkup = nextDouble(0, 1)
+ curPrice = (int)(curPrice*randMarkup/100 + curPrice)
+ }
+ }
+ def m = []
+ if(curPrice && dbo){
+ m << dbo.get("_id").toString()//¾ù¼ÛID
+ }else{
+ m << new ObjectId().toString()
+ }
+ m << rMap.get("_id").toString()//Â¥ÅÌID
+ m << rMap.city
+ m << rMap.region
+ m << rMap.name
+ if(curPrice){
+ m << curPrice
+ }else{
+ m << 0
+ }
+ m << curDate.toInteger();
+ result << m
+ }
+ return result
+ }
+
def createDatas(def city){
// def districts = CommonDatautils.findAllDistricts(city, "district", null);
// def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
// districts.addAll(removeDists)
- def districts = getFzDistricts(city)
+ def districts = getFzDistricts(city)
def endDateStr = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-10"
def dataStr = DateUtils.add(endDateStr, -30)
@@ -115,12 +154,13 @@ class DistrictPriceExportBatch extends BaseBatch{
// def key = row[2] + "##" + row[3] + "##" + row[4]
// map2.put(key, row[5])
// }
-
def lastMonthPriceMap = findFzDistrictStat("¸£ÖÝ",lastMonthDate)
+
def result = []
+
for(def rMap : districts){
- def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, startDate, lastDate)
+ def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, curDate)
def curPrice = 0
if(dbo){
def lastMonthPrice = lastMonthPriceMap.get(rMap.get("_id").toString())
@@ -165,6 +205,17 @@ class DistrictPriceExportBatch extends BaseBatch{
return result
}
+ def findFzDistrictSellStat(city,lastMonthDate){
+ def q = new BasicDBObject()
+ q.put("city", city)
+ q.put("date", lastMonthDate)
+ def priceMap = [:]
+ DISTRICT_SELL_STAT.find(q).each{
+ priceMap.put(it.commid, it)
+ }
+ return priceMap
+ }
+
def findFzDistrictStat(city,lastMonthDate){
def q = new BasicDBObject()
@@ -231,7 +282,6 @@ class DistrictPriceExportBatch extends BaseBatch{
udata.put("avg_price", r[5])
FZ_DISTRICT_STAT_COLL.update(q, new BasicDBObject('$set', udata))
}else{
- def udata = new BasicDBObject()
def o = new BasicDBObject()
println r[0]
o.put("_id", new ObjectId(r[0]))
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy
new file mode 100644
index 000000000..088626285
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy
@@ -0,0 +1,322 @@
+package com.fangjia.script.fuzhou
+
+import com.fangjia.core.util.DataUtil
+import com.fangjia.script.BaseBatch
+import com.fangjia.script.BatchOwner
+import com.fangjia.script.Watcher
+import com.fangjia.script.util.CommonUtils
+import com.fangjia.script.util.DateUtils
+import com.fangjia.script.util.DbUtils
+import com.fangjia.script.util.MongoUtils
+import com.mongodb.BasicDBObject
+import com.mongodb.DBCollection
+import com.mongodb.QueryOperators
+
+import java.text.DecimalFormat
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicLong
+
+//Ð¡ÇøÔ¶Ⱦù¼Û±í£¨´øÕǵø·ù¿ØÖÆ£©
+@BatchOwner(Watcher.GaoJuan)
+class DistrictSellStatBatch extends BaseBatch {
+
+ static DBCollection FZ_DISTRICT_STAT = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com")
+
+ static DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com")
+ static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com")
+ static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName("business", "fz_district", "mongo.db.fangjia.com")
+
+ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20)
+
+
+ public static void main(String[] args) {
+ runBatch(new DistrictSellStatBatch(), args);
+ }
+
+ @Override
+ void process(Object args) {
+ calcMonthlyPrice()
+ }
+
+
+ def getMomDate(int date){
+
+ Calendar calendar = Calendar.getInstance()
+ calendar.setTime(Date.parse("yyyyMM", String.valueOf(date)))
+ calendar.add(Calendar.MONTH, -1)
+ return calendar.getTime().format("yyyyMM").toInteger()
+ }
+
+ def getYoyDate(int date){
+
+ Calendar calendar = Calendar.getInstance()
+ calendar.setTime(Date.parse("yyyyMM", String.valueOf(date)))
+ calendar.add(Calendar.YEAR, -1)
+ return calendar.getTime().format("yyyyMM").toInteger()
+ }
+
+ def calcMonthlyPrice(){
+ def citys = CommonUtils.findAllCity()
+ def keys = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("estate_type2", 1)
+
+ def lastMonthWeekend = DateUtils.truncateDay(DateUtils.getLastSundayInWeekOfLastMonth(new Date()))
+
+ def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
+ def monDate = getMomDate(curMonth)
+ def yoyDate = getYoyDate(curMonth)
+
+ def index = 0
+ for(def city : citys){
+
+ index++
+ def districts = []
+ if(city == "¸£ÖÝ"){
+ districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList()
+ }else{
+ districts = DbUtils.seaweed.find(new BasicDBObject("city", city).append("cat", "district").append("visible", 0), keys).batchSize(2000)
+ }
+
+ def weekendPriceMap = findPriceMap(city, lastMonthWeekend)//ÉϸöÔÂÐ¡Çø¾ù¼Û
+ def curMonthlyPriceMap = findMonthlyPrice(city, curMonth)//µ±ÔÂÐ¡ÇøÔ¾ù¼Û
+ def lastMonthlyPriceMap = findMonthlyPrice(city, monDate)//ÉϸöÔÂÐ¡ÇøÔ¾ù¼Û
+ def lastYearPriceMap = findMonthlyPrice(city, yoyDate)//È¥ÄêÐ¡ÇøÔ¾ù¼Û
+ if(districts && weekendPriceMap){
+ running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap)
+ }
+ println index+" "+city +" "+ (new Date()).toString()
+ }
+ }
+
+ def running(districts){
+ def totalCount = new AtomicLong()
+ final CountDownLatch latch = new CountDownLatch(districts.size())
+ districts.each{ dist->
+ fixedThreadPool.execute(new Runnable() {
+ void run() {
+ try {
+ totalCount.addAndGet(1)
+ println totalCount.get()+" "+ dist.city+" "+dist.name
+ } catch (Exception e) {
+ e.printStackTrace()
+ } finally {
+ latch.countDown()
+ }
+ }
+ })
+ }
+ }
+
+ def running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap){
+ def totalCount = new AtomicLong()
+ final CountDownLatch latch = new CountDownLatch(districts.size())
+ def rets = new CopyOnWriteArrayList()
+
+ districts.each{dist->
+ fixedThreadPool.execute(new Runnable() {
+ void run() {
+ try {
+ totalCount.addAndGet(1)
+ def key = dist.region +"##" + dist.name
+ def weekendPriceObj = weekendPriceMap.get(key)
+ if(weekendPriceObj){
+ def curPriceObj = curMonthlyPriceMap.get(key)
+ def lastMonthPriceObj = lastMonthlyPriceMap.get(key)
+ def lastYearPriceObj = lastYearPriceMap.get(key)
+ double mom = 0d
+
+ if(lastMonthPriceObj) {
+ mom = DataUtil.roundDouble(((weekendPriceObj.avg_price - lastMonthPriceObj.avg_price)/(double)lastMonthPriceObj.avg_price),4)
+ }
+
+ def curPrice = null;
+ if(curPriceObj){
+ curPrice = curPriceObj.avg_price
+ }else{
+ curPrice = weekendPriceObj.avg_price
+ }
+
+ if(weekendPriceObj.value_type!=1){
+ if(dist.city == "¸£ÖÝ"){
+ if(Math.abs(mom)*100>3){
+ def randMarkup = nextDouble(0, 3)
+ if(mom < 0){
+ mom = DataUtil.roundDouble(randMarkup*(-1)/100, 4)
+ }else{
+ mom = DataUtil.roundDouble(randMarkup/100, 4)
+ }
+ curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price)
+ }
+ }else{
+ if(Math.abs(mom)*100>10){
+ def randMarkup = nextDouble(0, 10)
+ if(mom < 0){
+ mom = DataUtil.roundDouble(randMarkup*(-1)/100,4)
+ }else{
+ mom = DataUtil.roundDouble(randMarkup/100,4)
+ }
+ curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price)
+ }
+ }
+ }
+
+ double yoy = 0d
+ if(lastYearPriceObj){
+ yoy = DataUtil.roundDouble(((curPrice - lastYearPriceObj.avg_price)/(double)lastYearPriceObj.avg_price),4)
+ }
+ if(curPriceObj){
+ if(curPrice!=weekendPriceObj.avg_price){
+ def data = new BasicDBObject()
+ data.put("m_date", new Date())
+ data.put("commid", dist._id.toString())
+ data.put("mom", mom)
+ data.put("yoy", yoy)
+ data.put("avg_price", curPrice)
+ DISTRICT_SELL_STAT.update(new BasicDBObject("_id", curPriceObj._id) , new BasicDBObject('$set', data),true,false)
+ println "[update]"+totalCount.get()+" "+ dist.city+" "+dist.name
+ }
+ }else{
+ def data = new BasicDBObject()
+ data.put("city", dist.city)
+ data.put("region", dist.region)
+ data.put("district_name", dist.name)
+ data.put("estate_type", dist.estate_type2)
+ data.put("date", curMonth)
+ data.put("avg_price", curPrice)
+ data.put("credit", weekendPriceObj.credit)
+ data.put("m_date", new Date())
+ data.put("commid", dist._id.toString())
+ data.put("mom", mom)
+ data.put("yoy", yoy)
+ DISTRICT_SELL_STAT.save(data)
+ println "[save]"+totalCount.get()+" "+ dist.city+" "+dist.name
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace()
+ } finally {
+ latch.countDown()
+ }
+ };
+ })
+ }
+ latch.await()
+ }
+
+
+ //Ëæ»ú¸¡µãÊý
+ public static double nextDouble(final double min, final double max) throws Exception {
+
+ DecimalFormat df = new DecimalFormat("#.00");
+ if (max < min) {
+ throw new Exception("min < max");
+ }
+ if (min == max) {
+ return min;
+ }
+ return Double.parseDouble(df.format(min + ((max - min) * new Random().nextDouble())));
+ }
+
+
+ def findPriceMap(city, weekend){
+ def q = new BasicDBObject()
+ q.put("city", city)
+ q.put("weekend", weekend)
+ def dbcursor = DISTRICT_STAT.find(q)
+ def priceMap = [:]
+ for(def d : dbcursor){
+ priceMap.put(d.region +"##"+d.district_name, d)
+ }
+ return priceMap
+ }
+
+ def findMonthlyPrice(city, monDate){
+ def q = new BasicDBObject()
+ q.put("city", city)
+ q.put("date", monDate)
+ def dbcursor = DISTRICT_SELL_STAT.find(q)
+ def priceMap = [:]
+ for(def d : dbcursor){
+ priceMap.put(d.region +"##"+d.district_name, d)
+ }
+ return priceMap
+ }
+
+
+
+// def updateDistrictSellStat(citys){
+// def index = 0
+// citys.each{city->
+// index ++
+// def stats = FZ_DISTRICT_STAT.find(new BasicDBObject("month",202209).append("city", city).append("avg_price", new BasicDBObject(QueryOperators.GTE, 0))).asList()
+// if(stats){
+// batchUpdate(stats)
+// }
+// println "[${index}] "+city+" Íê³É"
+// }
+// }
+//
+// def batchUpdate(def stats){
+// def totalCount = new AtomicLong()
+// final CountDownLatch latch = new CountDownLatch(stats.size())
+//
+// for(def i=0;i0){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy
index 0231b21c0..47a3b331f 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy
@@ -5,9 +5,36 @@ import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.gj.EsUtils
import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.ExcelUtils
+import com.fangjia.script.util.MongoUtils
+import com.mongodb.BasicDBObject
+import com.mongodb.DBCollection
import org.apache.commons.io.FileUtils
import org.bson.types.ObjectId
+
+DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com")
+
+def datas = FileUtils.readLines("D:\\Êý¾Ý\\ÆäËü\\FJW_COMM_20221015.csv")
+def rets = []
+for(def d : datas){
+ def arrs = d.split("@")
+ rets << ["commId":arrs[0], "avg_price":arrs[4]]
+}
+
+for(def r : rets){
+ if(r.avg_price){
+ def udata = new BasicDBObject()
+ udata.put("date", 202210)
+ udata.put("avg", r.avg_price.toInteger())
+ DISTRICT_SELL_STAT.update(new BasicDBObject("commid", r.commId) , new BasicDBObject('$set', data),false,false)
+ }else{
+ println r.commId +" ²»´æÔÚ"
+ }
+}
+
+
+
+
//List list = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\FJW_HOUSE_201911.csv"))
//println "¹ýÂËǰ£º"+list.size()+ " "+new Date().toLocaleString()
//def ret = []
@@ -48,29 +75,29 @@ import org.bson.types.ObjectId
// return location;
//}
-List list1= FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202112.csv"))
-def map1 = [:]
-for(def s : list1){
- def row = s.split("@\\|@")
- def key = row[2]+"##"+row[3]+"##"+row[4]
- map1.put(key, row[5])
-}
-
-List list2 = FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202111.csv"))
-def map2 = [:]
-for(def s : list2) {
- def row = s.split("@\\|@")
- def key = row[2] + "##" + row[3] + "##" + row[4]
- map2.put(key, row[5])
-}
-def rows = []
-map1.each {k,v->
- def row = []
- def keys = k.split("##")
- def lastPrice = map2.get(k)
- rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()]
-}
-ExcelUtils.write("D:\\Êý¾Ý\\¸£ÖÝ\\¼Û¸ñ±È¶Ô12-2.xlsx", rows, "Êý¾Ý")
+//List list1= FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202112.csv"))
+//def map1 = [:]
+//for(def s : list1){
+// def row = s.split("@\\|@")
+// def key = row[2]+"##"+row[3]+"##"+row[4]
+// map1.put(key, row[5])
+//}
+//
+//List list2 = FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202111.csv"))
+//def map2 = [:]
+//for(def s : list2) {
+// def row = s.split("@\\|@")
+// def key = row[2] + "##" + row[3] + "##" + row[4]
+// map2.put(key, row[5])
+//}
+//def rows = []
+//map1.each {k,v->
+// def row = []
+// def keys = k.split("##")
+// def lastPrice = map2.get(k)
+// rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()]
+//}
+//ExcelUtils.write("D:\\Êý¾Ý\\¸£ÖÝ\\¼Û¸ñ±È¶Ô12-2.xlsx", rows, "Êý¾Ý")
//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\¸£ÖÝ\\¸£ÖÝÕÇ·ùÔÚ10%ÒÔÉÏÐ¡Çø.xlsx",{d->
// def obj = CommonDatautils.queryDistrictPrice(d['A'],d['B'], d['C'], DateUtils.parseFromTightByPattern("2021-10-10","yyyy-MM-dd"))
// if(obj){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy
index 43203f42f..7e4a0bd2c 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy
@@ -14,7 +14,7 @@ import com.mongodb.DBCollection
//¸£ÖݵÚÈý·½¾ù¼Ûͳ¼Æ,·¢ËͶ¤¶¤ÏûÏ¢
//def datas = ExcelUtils.read("d:\\Êý¾Ý\\¸£ÖÝ\\¸£ÖÝ4ÔÂ2.xlsx",0,1)
//def datas = CsvUtils.read("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv");
-def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202209.csv")
+def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202211.csv")
def count0 = 0
def count1 = 0
def count2 = 0
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy
new file mode 100644
index 000000000..3075ff1db
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YinLianMeiShi.groovy
@@ -0,0 +1,597 @@
+package com.fangjia.script.gj
+
+import com.fangjia.core.RegionData
+import com.fangjia.core.util.BaiDuApiUtils
+import com.fangjia.core.util.GeocodeUtils
+import com.fangjia.core.util.HttpRequest
+import com.fangjia.script.gj.district.FangjiaClientUtils
+import com.fangjia.script.linxsh.util.AddressUtil
+import com.fangjia.script.statistics.poi.AmapPoi
+import com.fangjia.script.temp.shenjian.util.GaoDeUtils
+import com.fangjia.script.util.CosineSimilarAlgorithm
+import com.fangjia.script.util.ExcelUtils
+import com.fangjia.script.util.MongoUtils
+import com.mongodb.BasicDBObject
+import com.mongodb.DBCollection
+import net.sf.json.JSONObject
+import org.apache.poi.ss.util.RegionUtil
+
+import java.util.regex.Pattern
+
+class YinLianMeiShi {
+
+ def baiduCityCodeMap = ["±±¾©": "131", "Ìì½ò": "332", "ʯ¼Òׯ": "150", "ÌÆÉ½": "265", "ÇØ»Êµº": "148", "ºªµ¦": "151", "ÐĮ̈": "266", "±£¶¨": "307", "ÕżҿÚ": "264", "³ÐµÂ": "207", "²×ÖÝ": "149", "ÀÈ·»": "191", "ºâË®": "208", "Ì«Ô": "176", "´óͬ": "355", "ÑôȪ": "357", "³¤ÖÎ": "356", "½ú³Ç": "290", "Ë·ÖÝ": "237", "½úÖÐ": "238", "Ô˳Ç": "328", "ÐÃÖÝ": "367", "ÁÙ·Ú": "368", "ÂÀÁº": "327", "ºôºÍºÆÌØ": "321", "°üÍ·": "229", "ÎÚº£": "123", "³à·å": "297", "ͨÁÉ": "64", "¶õ¶û¶à˹": "283", "ºôÂ×±´¶û": "61", "°ÍÑåÄ×¶û": "169", "ÎÚÀ¼²ì²¼": "168", "Ð˰²ÃË": "62", "ÎýÁÖ¹ùÀÕÃË": "63", "°¢ÀÉÆÃË": "230", "ÉòÑô": "58", "´óÁ¬": "167", "°°É½": "320", "¸§Ë³": "184", "±¾Ïª": "227", "µ¤¶«": "282", "½õÖÝ": "166", "Óª¿Ú": "281", "¸·ÐÂ": "59", "ÁÉÑô": "351", "Å̽õ": "228", "ÌúÁë": "60", "³¯Ñô": "280", "ºù«µº": "319", "³¤´º": "53", "¼ªÁÖÊÐ": "55", "ËÄÆ½": "56", "ÁÉÔ´": "183", "ͨ»¯": "165", "°×ɽ": "57", "ËÉÔ": "52", "°×³Ç": "51", "Ñӱ߳¯ÏÊ×å×ÔÖÎÖÝ": "54", "¹þ¶û±õ": "48", "ÆëÆë¹þ¶û": "41", "¼¦Î÷": "46", "º×¸Ú": "43", "˫Ѽɽ": "45", "´óÇì": "50", "ÒÁ´º": "40", "¼Ñľ˹": "42", "Æß̨ºÓ": "47", "ĵµ¤½": "49", "ºÚºÓ": "39", "Ë绯": "44", "´óÐ˰²ÁëµØÇø": "38", "ÉϺ£": "289", "ÄϾ©": "315", "ÎÞÎý": "317", "ÐìÖÝ": "316", "³£ÖÝ": "348", "ËÕÖÝ": "224", "ÄÏͨ": "161", "Á¬ÔƸÛ": "347", "»´°²": "162", "ÑγÇ": "223", "ÑïÖÝ": "346", "Õò½": "160", "Ì©ÖÝ": "276", "ËÞǨ": "277", "º¼ÖÝ": "179", "Äþ²¨": "180", "ÎÂÖÝ": "178", "¼ÎÐË": "334", "ºþÖÝ": "294", "ÉÜÐË": "293", "½ð»ª": "333", "áéÖÝ": "243", "ÖÛɽ": "245", "̨ÖÝ": "244", "ÀöË®": "292", "ºÏ·Ê": "127", "Îߺþ": "129", "°ö²º": "126", "»´ÄÏ": "250", "Âí°°É½": "358", "»´±±": "253", "ÍÁê": "337", "°²Çì": "130", "»ÆÉ½": "252", "³üÖÝ": "189", "¸·Ñô": "128", "ËÞÖÝ": "370", "³²ºþ": "251", "Áù°²": "298", "ÙñÖÝ": "188", "³ØÖÝ": "299", "Ðû³Ç": "190", "¸£ÖÝ": "300", "ÏÃÃÅ": "194", "ÆÎÌï": "195", "ÈýÃ÷": "254", "ȪÖÝ": "134", "ÕÄÖÝ": "255", "ÄÏÆ½": "133", "ÁúÑÒ": "193", "ÄþµÂ": "192", "Äϲý": "163", "¾°µÂÕò": "225", "ƼÏç": "350", "¾Å½": "349", "ÐÂÓà": "164", "ӥ̶": "279", "¸ÓÖÝ": "365", "¼ª°²": "318", "ÒË´º": "278", "¸§ÖÝ": "226", "ÉÏÈÄ": "364", "¼ÃÄÏ": "288", "Çൺ": "236", "×Ͳ©": "354", "Ôæ×¯": "172", "¶«Óª": "174", "ÑĮ̀": "326", "Ϋ·»": "287", "¼ÃÄþ": "286", "Ì©°²": "325", "Íþº£": "175", "ÈÕÕÕ": "173", "À³Îß": "124", "ÁÙÒÊ": "234", "µÂÖÝ": "372", "ÁijÇ": "366", "±õÖÝ": "235", "ºÊÔó": "353", "Ö£ÖÝ": "268", "¿ª·â": "210", "ÂåÑô": "153", "ƽ¶¥É½": "213", "°²Ñô": "267", "º×±Ú": "215", "ÐÂÏç": "152", "½¹×÷": "211", "å§Ñô": "209", "Ðí²ý": "155", "äðºÓ": "344", "ÈýÃÅÏ¿": "212", "ÄÏÑô": "309", "ÉÌÇð": "154", "ÐÅÑô": "214", "ÖÜ¿Ú": "308", "פÂíµê": "269", "Î人": "218", "»ÆÊ¯": "311", "Ê®Ñß": "216", "Ò˲ý": "270", "ÏåÑô": "156", "¶õÖÝ": "122", "¾£ÃÅ": "217", "Т¸Ð": "310", "¾£ÖÝ": "157", "»Æ¸Ô": "271", "ÏÌÄþ": "362", "ËæÖÝ": "371", "¶÷Ê©ÍÁ¼Ò×åÃç×å×ÔÖÎÖÝ": "373", "ÏÉÌÒ": "1713", "DZ½": "1293", "ÌìÃÅ": "2654", "ÉñÅ©¼ÜÁÖÇø": "2734", "³¤É³": "158", "ÖêÖÞ": "222", "ÏæÌ¶": "313", "ºâÑô": "159", "ÉÛÑô": "273", "ÔÀÑô": "220", "³£µÂ": "219", "Õżҽç": "312", "ÒæÑô": "272", "³»ÖÝ": "275", "ÓÀÖÝ": "314", "»³»¯": "363", "¦µ×": "221", "ÏæÎ÷ÍÁ¼Ò×åÃç×å×ÔÖÎÖÝ": "274", "¹ãÖÝ": "257", "ÉØ¹Ø": "137", "ÉîÛÚ": "340", "Ö麣": "140", "ÉÇÍ·": "303", "·ðɽ": "138", "½ÃÅ": "302", "Õ¿½": "198", "ïÃû": "139", "ÕØÇì": "338", "»ÝÖÝ": "301", "÷ÖÝ": "141", "ÉÇβ": "339", "ºÓÔ´": "200", "Ñô½": "199", "ÇåÔ¶": "197", "¶«Ý¸": "119", "ÖÐɽ": "187", "³±ÖÝ": "201", "½ÒÑô": "259", "ÔÆ¸¡": "258", "ÄÏÄþ": "261", "ÁøÖÝ": "305", "¹ðÁÖ": "142", "ÎàÖÝ": "304", "±±º£": "295", "·À³Ç¸Û": "204", "ÇÕÖÝ": "145", "¹ó¸Û": "341", "ÓñÁÖ": "361", "°ÙÉ«": "203", "ºØÖÝ": "260", "ºÓ³Ø": "143", "À´±ö": "202", "³ç×ó": "144", "º£¿Ú": "125", "ÈýÑÇ": "121", "Îåָɽ": "1644", "Çíº£": "2358", "ÙÙÖÝ": "1215", "ÎIJý": "2758", "ÍòÄþ": "1216", "¶«·½": "2634", "¶¨°²": "1214", "ÍͲý": "1641", "³ÎÂõ": "2757", "ÁÙ¸ß": "2033", "°×ɳÀè×å×ÔÖÎ": "2359", "²ý½Àè×å×ÔÖÎ": "1642", "ÀÖ¶«Àè×å×ÔÖÎ": "2032", "ÁêË®Àè×å×ÔÖÎ": "1643", "±£Í¤Àè×åÃç×å×ÔÖÎ": "1217", "ÇíÖÐÀè×åÃç×å×ÔÖÎ": "2031", "ÖØÇì": "132", "³É¶¼": "75", "×Ô¹±": "78", "ÅÊÖ¦»¨": "81", "ãòÖÝ": "331", "µÂÑô": "74", "ÃàÑô": "240", "¹ãÔª": "329", "ËìÄþ": "330", "ÄÚ½": "248", "ÀÖɽ": "79", "Äϳä": "291", "üɽ": "77", "Ò˱ö": "186", "¹ã°²": "241", "´ïÖÝ": "369", "ÑŰ²": "76", "°ÍÖÐ": "239", "×ÊÑô": "242", "°¢°Ó²Ø×åǼ×å×ÔÖÎÖÝ": "185", "¸Ê×βØ×å×ÔÖÎÖÝ": "73", "Á¹É½ÒÍ×å×ÔÖÎÖÝ": "80", "¹óÑô": "146", "ÁùÅÌË®": "147", "×ñÒå": "262", "°²Ë³": "263", "ÍÈʵØÇø": "205", "ÇÎ÷Äϲ¼ÒÀ×åÃç×å×ÔÖÎÖÝ": "343", "±Ï½ÚµØÇø": "206", "Ƕ«ÄÏÃç×å¶±×å×ÔÖÎÖÝ": "342", "ÇÄϲ¼ÒÀ×åÃç×å×ÔÖÎÖÝ": "306", "À¥Ã÷": "104", "Çú¾¸": "249", "ÓñϪ": "106", "±£É½": "112", "ÕÑͨ": "336", "Àö½": "114", "ÁÙ²×": "110", "³þÐÛÒÍ×å×ÔÖÎÖÝ": "105", "ºìºÓ¹þÄá×åÒÍ×å×ÔÖÎÖÝ": "107", "ÎÄɽ׳×åÃç×å×ÔÖÎÖÝ": "177", "ÆÕ¶ý": "108", "Î÷Ë«°æÄÉ´ö×å×ÔÖÎÖÝ": "109", "´óÀí°××å×ÔÖÎÖÝ": "111", "µÂºê´ö×å¾°ÆÄ×å×ÔÖÎÖÝ": "116", "ŽÀüËÛ×å×ÔÖÎÖÝ": "113", "µÏÇì²Ø×å×ÔÖÎÖÝ": "115", "ÀÈø": "100", "²ý¶¼µØÇø": "99", "ɽÄϵØÇø": "97", "ÈÕ¿¦ÔòµØÇø": "102", "ÄÇÇúµØÇø": "101", "°¢ÀïµØÇø": "103", "ÁÖÖ¥µØÇø": "98", "Î÷°²": "233", "Í´¨": "232", "±¦¼¦": "171", "ÏÌÑô": "323", "μÄÏ": "170", "ÑÓ°²": "284", "ººÖÐ": "352", "ÓÜÁÖ": "231", "°²¿µ": "324", "ÉÌÂå": "285", "À¼ÖÝ": "36", "¼ÎÓø¹Ø": "33", "½ð²ý": "34", "°×Òø": "35", "ÌìË®": "196", "ÎäÍþ": "118", "ÕÅÒ´": "117", "ƽÁ¹": "359", "¾ÆÈª": "37", "ÇìÑô": "135", "¶¨Î÷": "136", "¤ÄÏ": "256", "ÁÙÏÄ»Ø×å×ÔÖÎÖÝ": "182", "¸ÊÄϲØ×å×ÔÖÎÖÝ": "247", "Î÷Äþ": "66", "º£¶«µØÇø": "69", "º£±±²Ø×å×ÔÖÎÖÝ": "67", "»ÆÄϲØ×å×ÔÖÎÖÝ": "70", "º£ÄϲØ×å×ÔÖÎÖÝ": "68", "¹ûÂ岨×å×ÔÖÎÖÝ": "72", "ÓñÊ÷²Ø×å×ÔÖÎÖÝ": "71", "º£Î÷ÃɹÅ×岨×å×ÔÖÎÖÝ": "65", "Òø´¨": "360", "ʯ×ìɽ": "335", "ÎâÖÒ": "322", "¹ÌÔ": "246", "ÖÐÎÀ": "181", "ÎÚ³ľÆë": "92", "¿ËÀÂêÒÀ": "95", "ͳ·¬µØÇø": "89", "¹þÃܵØÇø": "91", "²ý¼ª»Ø×å×ÔÖÎÖÝ": "93", "²©¶ûËþÀÃɹÅ×ÔÖÎÖÝ": "88", "°ÍÒô¹ùÀãÃɹÅ×ÔÖÎÖÝ": "86", "°¢¿ËËÕµØÇø": "85", "¿Ë×ÎÀÕËտ¶û¿Ë×Î×ÔÖÎÖÝ": "84", "¿¦Ê²µØÇø": "83", "ºÍÌïµØÇø": "82", "ÒÁÀç": "90", "Ëþ³ÇµØÇø": "94", "°¢ÀÕÌ©µØÇø": "96", "ʯºÓ×Ó": "770", "°¢À¶û": "731", "Í¼Ä¾Êæ¿Ë": "792", "Îå¼ÒÇþ": "789", "Ïã¸ÛÌØ±ðÐÐÕþÇø": "2912", "°ÄÃÅÌØ±ðÐÐÕþÇø": "2911"]
+
+ DBCollection QCC_COLL = MongoUtils.getCollectionByName("crawl", "tyc_web_crawl", "192.168.0.206",27020)
+
+ def filters = []
+
+ static main(args) {
+ def task = new YinLianMeiShi();
+// task.run()
+// task.matchFlag()
+// task.marge()
+ task.addValueByBaiduId()
+ }
+
+ def addValueByBaiduId(){
+ ExcelUtils.modify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ(12-21).xlsx",{d->
+ if(d['A'] && d['T']=="°Ù¶ÈÈ˹¤"){
+ def jsonObj = BaiDuApiUtils.getDetailByUid(d['U'])
+ if(jsonObj && jsonObj.result){
+ def result = jsonObj.result
+ if(result){
+ d['J'] = result.uid
+ d['K'] = RegionData.formatRegion(result.city, result.area)
+ d['L'] = result.name
+ d['M'] = result.address
+ d['N'] = result.detail_info.tag
+ d['O'] = result.location.lng
+ d['P'] = result.location.lat
+ println result
+ }
+ }
+ }
+ })
+ }
+ def marge(){
+ def file1 = "D:\\Êý¾Ý\\ÒøÁª\\ÒøÁªÈ˹¤1221(ÁéÖ¥).xlsx"
+ def datas1 = ExcelUtils.read(file1, 0, 1)
+ ExcelUtils.modify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ(12-21).xlsx",{d->
+ if(d['A']){
+ for(def r : datas1){
+ if(r['A'] == d['A']){
+ List pois = GaoDeUtils.getAmapById2(r['F']);
+ if(pois && pois.size()==1){
+ def amapPoi = pois[0]
+ d['J'] = amapPoi.id
+ d['K'] = amapPoi.adname
+ d['L'] = amapPoi.name
+ d['M'] = amapPoi.address
+ d['N'] = amapPoi.type
+ def location = amapPoi.location
+ if(location){
+ def arrs = location.split(",")
+ // ¸ßµÂת°Ù¶È
+ def baidu = BaiDuApiUtils.geoconv(arrs[0].toString().toDouble(), arrs[1].toString().toDouble(), 3)
+ def lng2 = baidu.x
+ def lat2 = baidu.y
+ d['O'] = lng2
+ d['P'] = lat2
+ }
+ }
+ println pois
+ }
+ }
+ }
+ })
+ }
+
+ def run(){
+ ExcelUtils.modify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ£¨ºÏ²¢È˹¤).xlsx",{row->
+ def score = row['Q']
+ if(row['B'] && !row['L']){
+ def baiduCode = getBaiduMapCode(row['E']);
+ def city = RegionData.formatCity(row['E']);
+ if(!baiduCode){
+ baiduCode = getBaiduMapCode(city);
+ }
+
+ def newKeys = filterName(row['D'], row['E'], row['F'], row['B'])
+ row['I'] = newKeys
+
+ if(baiduCode){
+ def map = getSimpleAddress(city, row['C'])
+ def simpleAddr = map.addr
+ if(map.city!="ÊÐÏ½Çø" && map.city!=city){
+ city = RegionData.formatCity(map.city);
+ }
+ def rets = getBiduSearchDatas(baiduCode , simpleAddr, row['B'], null)
+ rets = getBiduSearchDatas(baiduCode , null, row['B'], rets)
+ rets = getBiduSearchDatas(baiduCode , null, simpleAddr, rets)
+ def bdRes = searchMapBySimilar(city, row['F'], row['B'], simpleAddr, rets, newKeys);
+ if (bdRes) {
+ row['J'] = bdRes.uid
+ row['K'] = bdRes.region
+ row['L'] = bdRes.name
+ row['M'] = bdRes.old_addr
+ row['N'] = bdRes.type
+ row['O'] = bdRes.baidu_lng2
+ row['P'] = bdRes.baidu_lat2
+ row['Q'] = bdRes.score
+ if(bdRes.matchType){
+ row['R'] = bdRes.matchType
+ }
+ }
+ println row['B'] +" "+ bdRes
+ }
+
+ }
+ })
+ }
+
+ def matchFlag(){
+ ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ£¨ºÏ²¢È˹¤).xlsx",{row->
+ if(row['B'] && row['B'].contains("Âó¼ÓÃÀ¶´å²ÍÌü")){
+ def datas = findQccData(row['B'])
+ if(datas){
+ def max_score = 0
+ def last_obj = null
+ def newKeys = filterName(row['D'], row['E'], row['F'], row['B'])
+ def city = RegionData.formatCity(row['E']);
+ for(def d : datas){
+
+ def map = getSimpleAddress(null, d.address)
+ def inputMap = getSimpleAddress(null, row['C'])
+ if(inputMap && inputMap.city){
+ city = inputMap.city
+ }
+ if(map && city==map.city){
+ def qccNameKey = filterName(map.pro, map.city, map.region, d.name)
+ def name_score = CosineSimilarAlgorithm.getSimilarityRatio(newKeys, qccNameKey);
+ def addr_score = 0
+ if (map.addr && inputMap.addr) {
+ if(map.addr.contains("Óë")){
+ def arrs = map.addr.split("Óë")
+ for(def s1 : arrs){
+ def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inputMap.addr, s1);
+ if(temp_addr_score > addr_score){
+ addr_score = temp_addr_score
+ }
+ }
+ }else{
+ addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inputMap.addr, map.addr);
+ }
+ }
+
+ def total_score = name_score + addr_score
+ if(total_score > max_score){
+ max_score = total_score;
+ last_obj = d
+ last_obj.simple_addr = map.addr
+ last_obj.tyc_city = map.city
+ }
+ println row['B'] +" "+ d.name+" "+total_score
+ }else{
+ def qccNameKey = filterName(map.pro, map.city, map.region, d.name)
+ def name_score = CosineSimilarAlgorithm.getSimilarityRatio(newKeys, qccNameKey);
+ if(map.addr && inputMap.addr && (inputMap.addr.contains(map.addr) || map.addr.contains(inputMap.addr))){
+ max_score = name_score;
+ last_obj = d
+ last_obj.simple_addr = map.addr
+ last_obj.tyc_city = map.city
+ println row['B'] +" "+ d.name+" "+name_score
+ }
+ }
+ }
+ if(max_score && max_score > 0.4){
+ row['AB'] = last_obj.name
+ row['AC'] = last_obj.address
+ row['AD'] = last_obj.flag
+ row['AE'] = max_score
+ }
+ }
+ }
+ });
+ }
+
+ def findQccData(keywords){
+ def q = new BasicDBObject()
+// q.put("search_terms", keywords)
+ if(keywords.contains("(*")){
+ keywords = keywords.toString().substring(0, keywords.toString().indexOf("(*"))
+ }
+ q.put("search_terms", Pattern.compile("^.*${keywords}.*\$", Pattern.CASE_INSENSITIVE))
+ def dbcursor = QCC_COLL.find(q)
+ def rets = []
+ for(def d : dbcursor){
+ rets << ["name":d.name, "address":d.taxAddress, "flag":d.regStatus]
+ }
+ return rets;
+ }
+ def getBiduSearchDatas(baiduCode , simpleAddr, nameKey, rets){
+ def searchKey = ""
+ if(simpleAddr){
+ searchKey = simpleAddr +" "+nameKey
+ }else{
+ searchKey = nameKey
+ }
+ def datas = searchBaiDuMap(searchKey, baiduCode.toInteger());
+ if(!rets){
+ return datas;
+ }else{
+ def ids = []
+ for(def r : rets){
+ if(!ids.contains(r.uid)){
+ ids << r.uid
+ }
+ }
+ for(def d : datas){
+ if(!ids.contains(d.uid)){
+ rets << d
+ }
+ }
+ return rets;
+ }
+ return null;
+ }
+
+
+ def getSimpleAddress(city, address){
+ def jsonObj = FangjiaClientUtils.addressStructure(city, address)
+ def old_addr = ""
+ def map = [:]
+ if(jsonObj && jsonObj.result){
+
+ if(jsonObj.result.province){
+ map.pro = jsonObj.result.province
+ }
+
+ if(jsonObj.result.city){
+ if(jsonObj.result.city=="ÊÐÏ½Çø"){
+ map.city = jsonObj.result.province
+ }else{
+ map.city = jsonObj.result.city
+ }
+ map.city = RegionData.formatCity(map.city)
+ }
+
+ if(jsonObj.result.district){
+ map.region = jsonObj.result.district
+ }
+ if(jsonObj.result.street){
+ def street = jsonObj.result.street
+ if(street){
+ old_addr = street
+ map.street = street.replace("½»²æ¿Ú","").replace("½»²æ","")
+ }
+ }
+ if(jsonObj.result.streetNumber){
+ def street_number = jsonObj.result.streetNumber
+ if(street_number){
+ old_addr = old_addr + street_number
+ }
+ }
+ }
+ map.addr = old_addr.replace("½»²æ¿Ú","").replace("½»²æ","")
+ return map;
+ }
+
+ def filterName(pro,city, region, name){
+ def newKey = name.replace("²ÍÒû·þÎñÓÐÏÞ¹«Ë¾","").replace("¿Ø¹ÉÓÐÏÞ¹«Ë¾","").replace("ÓÐÏÞÔðÈι«Ë¾", "").replace("ÓÐÏÞ¹«Ë¾","").replace("²ÍÒû","")
+ if(pro && name.contains(pro)){
+ newKey = newKey.replace(pro, "")
+ }
+
+ def newCity = RegionData.formatCity(city)
+ if(city && (name.contains(city) || name.contains(newCity))){
+ newKey = newKey.replace(city, "").replace(newCity, "")
+ }
+
+ if(region && newKey.contains(region) ){
+ newKey = newKey.replace(region, "")
+ }
+
+ def newRegion = null
+ if(region){
+ newRegion = RegionData.formatRegion(city, region)
+ }
+ if(newRegion && newKey.contains(newRegion)){
+ newKey = newKey.replace(newRegion, "")
+ }
+
+ if(newKey.contains("(") || newKey.contains("£¨")){
+ if(newKey.contains("(")){
+ def subName = newKey.substring(newKey.indexOf("(")+1, newKey.indexOf(")"));
+ if(subName.endsWith("½Ö") || subName.endsWith("·") || subName.contains("*") || subName.endsWith("µê")){
+ newKey = newKey.replace("("+subName+")", "");
+ }
+ }
+ newKey = newKey.replace("(","").replace(")","").replace("£¨","").replace("£©","")
+ if(newKey.toString().endsWith("µê")){
+ newKey = newKey.substring(0, newKey.size()-1)
+ }
+ }
+ return newKey;
+ }
+
+ def filterName2(pro,city, region, name){
+ def newKey = name.replace("²ÍÒû·þÎñÓÐÏÞ¹«Ë¾","").replace("¿Ø¹ÉÓÐÏÞ¹«Ë¾","").replace("ÓÐÏÞÔðÈι«Ë¾", "").replace("ÓÐÏÞ¹«Ë¾","").replace("²ÍÒû","")
+ if(pro && name.contains(pro)){
+ newKey = newKey.replace(pro, "")
+ }
+
+ def newCity = RegionData.formatCity(city)
+ if(city && (name.contains(city) || name.contains(newCity))){
+ newKey = newKey.replace(city, "").replace(newCity, "")
+ }
+
+ if(region && newKey.contains(region) ){
+ newKey = newKey.replace(region, "")
+ }
+
+ def newRegion = null
+ if(region){
+ newRegion = RegionData.formatRegion(city, region)
+ }
+ if(newRegion && newKey.contains(newRegion)){
+ newKey = newKey.replace(newRegion, "")
+ }
+
+ newKey = newKey.replace("(","").replace(")","").replace("£¨","").replace("£©","")
+ return newKey;
+ }
+
+ def getBaiduMapCode(city){
+ if(city){
+ return baiduCityCodeMap[city]
+ }
+ return city
+ }
+
+ static def searchBaiDuMap(String address, int cityCode) {
+ def rets = []
+ try {
+ Thread.sleep(500)
+ // String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${System.currentTimeMillis()}&&auth=Dae1RaNR1LK8xdJTxN8SQOTRa2AH%3DL7vuxLNVENTxRBt6BG6B6WJWwGvzBU%40yYxvkGcuVtvvhguVtvyheuVtcvY1SGpuLtB2QKAZzvCQMuVtvIPcuxtw8wkv7uvZgMuVtv%40vcuVtvc3CuVtvcPPuztxgHxwBVDzvFosSE21wiKDv7uvhgMuzVVtvrMhuENLtSrrlrIKHf0wd0vyMO7FOUySy&seckey=Im7p%2FanwNmQx078ijew%2FsyQrDC7YJnynqrZ43JVFlM0%3D%2C0-Ulo82T3hd3wuKMf_tTM-ZXYa3S1Y21RX3DV_l5MHgI_1U55ZQrzxTIKi3BRb2x59mVOurDjnW_8CwMEmjK3y8JfHyV0kv70GMQXxnIEcHpM3Dqhs5EdrN6ciDtoxyrcRfowp_xTBkEgU49ZrCz2KeLyujCOypqjKS3rAmPOfEp1kIZPD4W6RDQzrsWTe7a";
+ String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=after_baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=19&from=webmap&sug_forward=&auth=E8LCawOwRbEOx6JVTvCIBI6W7zSz5vSXuxLNVENTRVLtUDHUDUYKYyHxzBU%40yYxvkGcuVtvvhguVtvyheuVtvCMGuVtvCQMuVtvIPcuxtw8wkv7uvZgMuVtv%40vcuVtvc3CuVtvcPPuztxgHxwDWBWvveh3uxtwiKDv7uvhgMuzVVtcvY1SGpuxRtKHZz3VP8JSrrlrIKHf0wd0vyMO7FOUS7F&seckey=Im7p%2FanwNmQx078ijew%2FsyQrDC7YJnynqrZ43JVFlM0%3D%2C0-Ulo82T3hd3wuKMf_tTM-ZXYa3S1Y21RX3DV_l5MHgI_1U55ZQrzxTIKi3BRb2x59mVOurDjnW_8CwMEmjK3y8JfHyV0kv70GMQXxnIEcHpM3Dqhs5EdrN6ciDtoxyrcRfowp_xTBkEgU49ZrCz2KeLyujCOypqjKS3rAmPOfEp1kIZPD4W6RDQzrsWTe7a&device_ratio=2&tn=B_NORMAL_MAP&nn=0&u_loc=13513133,3631861&ie=utf-8&t=${System.currentTimeMillis()}&newfrom=zhuzhan_webmap"
+ def content = new HttpRequest().get(url, null, "utf-8")
+ JSONObject json = JSONObject.fromObject(content)
+ if (json && json.content && json.content.size() > 0) {
+ for (def loc : json.content) {
+// String name = formatName(address)
+ def x = loc.x
+ def y = loc.y
+ if(x){
+ x = x/100
+ }
+ if(y){
+ y = y/100
+ }
+ if(x && y){
+ def locJson = BaiDuApiUtils.geoconv(x, y, 6)
+ if(locJson){
+ def baiduCity = RegionData.parseCityInAddress(loc.area_name)
+ def bean = [:]
+ def lng2 = locJson.get("x")
+ def lat2 = locJson.get("y")
+ def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2)
+ def lng = gmap.get("lng")
+ def lat = gmap.get("lat")
+ bean.uid = loc.uid
+ bean.baidu_lng2 = lng2
+ bean.baidu_lat2 = lat2
+ bean.longitude = lng
+ bean.latitude = lat
+ bean.name = loc.name
+ if(loc.address_norm){
+ bean.address = getAddressInfo(loc.address_norm, loc.addr);
+ }
+ bean.old_addr = loc.addr
+
+ if(!baiduCity){
+ baiduCity = RegionData.formatCity(loc.city_name)
+ }
+ bean.cityname = baiduCity
+ if(loc.city_name){
+ def regionStr = loc.area_name.replace(loc.city_name, "")
+ def baiduRegion = RegionData.formatRegion(baiduCity, regionStr);
+ bean.region = baiduRegion
+ }
+
+ if(loc.std_tag){
+ bean.type = loc.std_tag
+ }
+ bean.flag = loc.acc_flag
+ rets << bean;
+ }
+ }
+ }
+ }
+ } catch(Exception e) {
+ searchBaiDuMap(address, cityCode)
+ }
+ return rets;
+ }
+
+ def static formatName(String name) {
+ if(name.indexOf("¡¤") != -1) {
+ name = name.replaceAll("¡¤", "")
+ }
+
+ if(name.indexOf(".") != -1) {
+ name = name.replace(".", "")
+ }
+ if(name.indexOf("(") != -1) {
+ name = name.replace("(", "")
+ }
+ if(name.indexOf(")") != -1) {
+ name = name.replace(")", "")
+ }
+ if(name.indexOf("-")!=-1){
+ name = name.replace("-","")
+ }
+ return name.replaceAll("\\s+", "").toLowerCase()
+ }
+
+
+ static def getAddressInfo(def s, def addr){
+ def arrs = s.split("]")
+ def map = [:]
+ if(arrs && arrs.size()>=3){
+ if(arrs[0] && arrs[0].contains("PROV")){
+ map.prov = arrs[0].substring(1, arrs[0].indexOf("("))
+ }
+ if(arrs[1] && arrs[1].contains("CITY")){
+ map.city = arrs[1].substring(1, arrs[1].indexOf("("))
+ }
+ if(arrs[2] && arrs[2].contains("AREA")){
+ map.region = arrs[2].substring(1, arrs[2].indexOf("("))
+ }
+ }
+ if(addr){
+ addr = addr.replace("[]","")
+ }
+ if(addr && map){
+ if(map.region && !addr.contains(map.region)){
+ addr = map.region + addr
+ }
+ if(map.city && !addr.contains(map.city)){
+ addr = map.city + addr
+ }
+
+ if(map.prov && !addr.contains(map.prov)){
+ addr = map.prov + addr
+ }
+ }
+ return addr;
+ }
+
+
+
+ def searchMapBySimilar(def city, def region, def name, def inpAddr, def rets, newKey){
+ def bo = null;
+ if(rets){
+ def maxScore = 0;
+ if(!bo || !maxScore){
+ for(def o :rets){
+ def s = o.name
+// if(o.name && o.name.contains("(") && !o.name.toString().startsWith("(")){
+// s = o.name.substring(0, o.name.indexOf("("))
+// }
+// s = formatName(s)
+ def addr = o.address
+ def mapKey = filterName(null, o.cityname, o.region, o.name)
+ def mapKey1 = filterName2(null, o.cityname, o.region, o.name)
+
+ if(mapKey){
+ def score = CosineSimilarAlgorithm.getSimilarityRatio(mapKey, newKey);
+ def score1 = CosineSimilarAlgorithm.getSimilarityRatio(mapKey1, newKey);
+ if(score1>score){
+ score = score1
+ }
+ def addr_score = 0
+ if(inpAddr) {
+ def baidu_addr_map = getSimpleAddress(o.cityname, o.old_addr)
+ if(!baidu_addr_map.addr){
+ baidu_addr_map.addr = AddressUtil.formatAddress(o.cityname, o.old_addr)
+ }
+ if(!baidu_addr_map.addr){
+ if(o.region && !region.contains(o.region)){
+ continue;
+ }
+ if(city!=o.cityname){
+ continue;
+ }
+ }
+ if (baidu_addr_map.addr) {
+ if(baidu_addr_map.addr.contains("Óë")){
+ def arrs = baidu_addr_map.addr.split("Óë")
+ for(def s1 : arrs){
+ def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, s1);
+ if(temp_addr_score > addr_score && (inpAddr.contains(baidu_addr_map.addr) || baidu_addr_map.addr.contains(inpAddr))){
+ addr_score = temp_addr_score
+ }
+ }
+ }else{
+ addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr_map.addr);
+ if(addr_score>0 && inpAddr && baidu_addr_map.street && !inpAddr.contains(baidu_addr_map.street) && !baidu_addr_map.street.contains(inpAddr)){
+ addr_score = 0
+ }
+ }
+
+ }
+ }
+
+ if(addr_score>0 && score==0){
+ addr_score = addr_score/2
+ }
+ def total_score = score + addr_score
+// if(city==o.cityname){
+ if(total_score > maxScore){
+ maxScore = total_score;
+ o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ"
+ o.city = o.cityname
+ bo = o
+ bo.score = maxScore
+
+ if(addr_score>0.6){
+ o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ£¬µØÖ·ÓйØ"
+ }
+ }
+// if(bo && score!=1){
+// if(inpAddr){
+// def baidu_addr = getSimpleAddress(o.cityname, o.old_addr)
+// if(baidu_addr){
+// def addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr);
+// //if(addr_score==1){
+// // o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ£¬µØÖ·ÓйØ"
+// bo.score = bo.score + addr_score
+// maxScore = bo.score;
+// //}
+// }
+// }
+
+// for(def word : filters){
+// if(mapKeyName.toString().endsWith(word)){
+// mapKeyName = mapKeyName.replace(word, "")
+// }
+// if(newName.toString().endsWith(word)){
+// newName = newName.replace(word, "");
+// }
+// }
+//
+//
+// if(mapKeyName && newName && mapKeyName.length()>=2){
+// score = CosineSimilarAlgorithm.getSimilarityRatio(mapKeyName, newName);
+// if(score > maxScore){
+// maxScore = score
+// o.matchType = "Ãû³ÆÏàËÆ"
+// o.city = obj.city
+// bo = o
+// bo.score = maxScore
+// }else{
+// if(mapKeyName.length() == newName.length()){
+// def mapKeyNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(mapKeyName, " ")
+// def newNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ")
+// if(mapKeyNameBY == newNameBY){
+// maxScore = 0.977;
+// o.matchType = "Æ´ÒôÏàËÆ"
+// o.city = obj.city
+// bo = o
+// bo.score = maxScore
+// }
+// }
+// }
+// }
+// }
+// }
+ }
+ }
+ }
+ }
+ return bo;
+ }
+
+
+}
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 6ccaabde3..4f5efcea8 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
@@ -48,13 +48,13 @@ class YouDaDataParser {
def final AtomicInteger count_ = new AtomicInteger(0)
- static def statDate = "2022-09-01"
+ static def statDate = "2022-10-01"
static main(args) {
def task = new YouDaDataParser();
// task.newHouseparse();//ÓÑ´ïÒ»ÊÖ·¿´æÈëmongo
-// task.esfParser("D:\\Êý¾Ý\\ÓÑ´ï\\2022Äê10ÔÂ\\²éѯ1.DBF");//ÓÑ´ï¶þÊÖ·¿´æÈëmongo
+// task.esfParser("D:\\Êý¾Ý\\ÓÑ´ï\\2022Äê12ÔÂ\\²éѯ1.DBF");//ÓÑ´ï¶þÊÖ·¿´æÈëmongo
// task.newhouseToSaveEs();//з¿±£´æµ½es
-// task.esfhouseToSaveEs();//¶þÊÖ·¿±£´æµ½es
+ task.esfhouseToSaveEs();//¶þÊÖ·¿±£´æµ½es
// task.updateFinishDateByEsfTrade();//¸ù¾Ý¶þÊֳɽ»µÄ¿¢¹¤Ê±¼äÐÞ¸Äseaweed¿âÖеĿ¢¹¤Ê±¼ä
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy
index 66ff6a8f3..e343714fd 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy
@@ -221,6 +221,15 @@ class CcbCodeUtils {
}
return "99"
}
+
+ static def getUseTypeCode(def estateType){
+ if(estateType=="ÉÌס"){
+ return "13"
+ }else if(estateType && (estateType=="ÆÕͨסլ")){
+ return "11"
+ }
+ return "11"
+ }
//ÊÒÄڽṹ
//ƽ²ã:11 ´í²ã:12 ¸´Ê½:13 ¸óÂ¥:14 ÍŽủ:15 ÀÏʽ·¿:16 µØÏÂÊÒ:17 ´ø¸óÂ¥:21 ´ø³µ¿â:22 ÆäËû:99 Ô¾²ã:18 ´øµØÏÂÊÒ:24 ´ø´¢²ØÊÒ:25 ´ø³µÎ»:23
static def getHouseStructureCode(){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy
index 418b6c102..cb615604a 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/chongqingblank/DataMatch.groovy
@@ -29,7 +29,30 @@ class DataMatch {
// task.run3()
// println task.findAddress("²ýÖݽֵÀÌÄÏã·")
- task.run2MatchV2( "D:\\Êý¾Ý\\ÖØÇìÅ©ÉÌÐÐ\\¹ÀÖµ1-V2.xlsx")
+// task.run2MatchV2( "D:\\Êý¾Ý\\ÖØÇìÅ©ÉÌÐÐ\\¹ÀÖµ1-V2.xlsx")
+ task.fzWeiyuanshuMatch("D:\\Êý¾Ý\\¸£ÖÝ\\Á¬½Â¥ÅÌ.xlsx")
+ }
+
+ def fzWeiyuanshuMatch(fileName){
+ ExcelUtils.multiThreadingModify(fileName,{d->
+// if(!d['G']){
+// def arr = OpenApiClient.search("¸£ÖÝ", "Á¬½", d['C'])
+// if(arr){
+// d['E'] = arr.city
+// d['F'] = arr.district
+// d['G'] = arr.name
+// }
+// }
+
+ def results = null
+ if(d['H'] && d['H']=="F" && d['C']){
+ results = OpenApiClient.addressMatch("¸£ÖÝ",d['C'], "property", false, "Á¬½", null)
+ }
+ if(results && results.precise>=0){
+ d['J'] = results.district
+ d['K'] = results.name
+ }
+ },0)
}
def run1(){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy
index f990711be..7a1d976ee 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy
@@ -2,51 +2,172 @@ package com.fangjia.script.gj.crawl
import com.fangjia.script.commData.CommonDatautils
import com.fangjia.script.temp.shenjian.util.SeaweedUtils
+import com.fangjia.script.util.DbUtils
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.OpenApiClient
+import com.mongodb.BasicDBObject
+import org.bson.types.ObjectId
class AnjukeDistrictMatch {
static main(args) {
def task = new AnjukeDistrictMatch();
- task.run();
+// task.run();
// task.run1()
+// task.updateField()
+ task.fenQiRun()
}
- def run1(){
- def regionPointsMap = findRegionRange("ÖØÇì")
- def flag = isInArea(dist.lng/10000000000.0, dist.lat/10000000000.0, regionPointsMap.get(dist.region))
+ def fenQiRun(){
+ def citys = ['ËÕÖÝ','º¼ÖÝ','Äþ²¨','ÎÂÖÝ','¼ÎÐË','ºþÖÝ','ÉÜÐË','½ð»ª','áéÖÝ','ÖÛɽ','̨ÖÝ','ÀöË®']
+ for(def c : citys){
+ def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region","name","virescence_percent","build_area","all_area","cubage_percent","master_district_name"])
+ def distMap = findFiqiDatas(dists)
+ println c +" "+dists.size() +" "+ distMap.size()
+ addFieldValue(distMap);
+ }
}
+
+ def addFieldValue(distMap){
+ def index = 0
+ distMap.each {k,v->
+ if(v.master_district_name!="master"){
+ def masterKey = v.city +"##"+v.region+"##"+v.master_district_name;
+// def masterObj = distMap.get(masterKey)
+ def masterObj = CommonDatautils.findDistrict(v.city, v.region, v.master_district_name, "district");
+ if(masterObj){
+ def udata = new BasicDBObject()
+ if(!v.virescence_percent && masterObj.virescence_percent){
+ udata.put("virescence_percent", masterObj.virescence_percent)
+ }
+
+ if(!v.build_area && masterObj.build_area){
+ udata.put("build_area", masterObj.build_area)
+ }
+
+ if(!v.all_area && masterObj.all_area){
+ udata.put("all_area", masterObj.all_area)
+ }
+
+ if(!v.cubage_percent && masterObj.cubage_percent){
+ udata.put("cubage_percent", masterObj.cubage_percent)
+ }
+
+ if(udata){
+ index ++
+ udata.put("m_date",new Date())
+ def q = new BasicDBObject()
+ q.put("_id", new ObjectId(v._id.toString()))
+ DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
+ }
+
+ }
+ }
+ }
+ println index;
+ }
+
+ def findFiqiDatas(dists){
+ def distMap = [:]
+ for(def d : dists){
+ def master_district_name = d.master_district_name
+ if(master_district_name && master_district_name!="null"){
+ distMap.put(d.city+"##"+d.region+"##"+d.name, d);
+ }
+ }
+ return distMap;
+ }
+
+
+ def updateField(){
+ def filePath = "D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\ÂÌ»¯ÂÊ.xlsx"
+ ExcelUtils.multiThreadingModify(filePath, { row ->
+ if(row['Q'] && !row['Q'].contains("½Ó¿Ú")){
+ def dist = CommonDatautils.findSeaweedById(row['R'], ["virescence_percent"])
+ if(dist && !dist.virescence_percent){
+ def val = row['K']
+ if(!val){
+ val = row['J']
+ }
+ if(!val){
+ val = row['M']
+ }
+ if(!val){
+ val = row['O']
+ }
+ if(!val){
+ val = row['G']
+ }
+ if(!val){
+ val = row['E']
+ }
+ if(!val){
+ val = row['F']
+ }
+ if(!val){
+ val = row['H']
+ }
+ if(!val){
+ val = row['I']
+ }
+ if(!val){
+ val = row['L']
+ }
+ if(!val){
+ val = row['N']
+ }
+ if(!val){
+ val = row['O']
+ }
+
+ if(val){
+ if(val.toString().toDouble().toInteger()==val.toString().toDouble()){
+ val = val.toString().toDouble().toInteger()
+ }
+ def udata = new BasicDBObject()
+ udata.put("virescence_percent", val.toString())
+ udata.put("m_date",new Date())
+
+ def q = new BasicDBObject()
+ q.put("_id", new ObjectId(dist._id.toString()))
+ DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
+ row['U'] = 1
+ }
+ }
+ }
+ })
+ }
+
+// def run1(){
+// def regionPointsMap = findRegionRange("ÖØÇì")
+// def flag = isInArea(dist.lng/10000000000.0, dist.lat/10000000000.0, regionPointsMap.get(dist.region))
+// }
def run(){
-
-
- def filePath = "D:\\Êý¾Ý\\ÖØÇìÅ©ÉÌÐÐ\\°²¾Ó¿Í\\ÖØÇìÐ¡Çø.xlsx"
+ def filePath = "D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\ÂÌ»¯ÂÊ.xlsx"
ExcelUtils.multiThreadingModify(filePath,{row->
- if(row['A'] && !row['J']){
+ if(row['A'] && !row['Q']){
def city = row['B']
def region = row['C']
def name = row['D']
- def address = row['E']
-// def flag = "±ðÃûÆ¥Åä"
-
-// def dist = matchDist(city, null, name)
-// if(!row['J'] && name.contains("(")){
-// name = name.replace("(${region})","").replace("(","").replace(")","")
-// flag = "È¥À¨ºÅÆ¥Åä"
-// dist = matchDist(city, region, name)
-// }
-// if(!dist){
-// dist = CommonDatautils.findSeaweedByMappingAlias(city, region, name,"district")
-// flag = "Ó³Éä±ðÃûÆ¥Åä"
-// }
-// if(!dist) {
-// def rets = CommonDatautils.findDistrictByAlias(city, region, name, "district")
-// if(rets && rets.size()==1){
-// dist = rets[0]
-// }
-// }
+ def flag = "Ãû³ÆÆ¥Åä"
+ def dist = matchDist(city, region, name)
+ if(!row['D'] && name.contains("(")){
+ name = name.replace("(${region})","").replace("(","").replace(")","")
+ flag = "È¥À¨ºÅÆ¥Åä"
+ dist = matchDist(city, region, name)
+ }
+ if(!dist){
+ dist = CommonDatautils.findSeaweedByMappingAlias(city, region, name,"district")
+ flag = "Ó³Éä±ðÃûÆ¥Åä"
+ }
+ if(!dist) {
+ def rets = CommonDatautils.findDistrictByAlias(city, region, name, "district")
+ if(rets && rets.size()==1){
+ dist = rets[0]
+ }
+ }
//
// if(!dist){
@@ -61,23 +182,21 @@ class AnjukeDistrictMatch {
// }
// }
-// if(dist){
-// row['J'] = flag
-// row['K'] = dist._id.toString()
-// row['L'] = dist.region
-// row['M'] = dist.name
-// row['N'] = dist.address
-// }
-
- def jsonObject = OpenApiClient.addressMatch(city, address, "property", false,region,name)
- if(jsonObject != null && jsonObject.precise!=-1) {
-// row['J'] = "Æ¥Åä½Ó¿Ú"
-// row['K'] = jsonObject.get("id")
-// row['L'] = jsonObject.get("district")
-// row['M'] = jsonObject.get("name")
-// row['N'] = jsonObject.get("address")
- row['M'] = jsonObject.get("name")
+ if(dist){
+ row['Q'] = flag
+ row['R'] = dist._id.toString()
+ row['S'] = dist.region
+ row['T'] = dist.name
+ }else{
+ def jsonObject = OpenApiClient.addressMatch(city, name, "property", false,region, null)
+ if(jsonObject != null && jsonObject.precise!=-1) {
+ row['Q'] = "Æ¥Åä½Ó¿Ú"
+ row['R'] = jsonObject.get("id")
+ row['S'] = jsonObject.get("district")
+ row['T'] = jsonObject.get("name")
+ }
}
+
}
})
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy
index 9f3670a44..4b363b071 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy
@@ -67,6 +67,7 @@ class FangjiaClientUtils {
+ //·Ö´Ê Ê¡£¬ÊУ¬Çø
public static def addressStand(def city, def address){
def jsonObj = null
def content = null
@@ -84,6 +85,27 @@ class FangjiaClientUtils {
return jsonObj;
}
+ //·Ö´Ê»ù´¡Éϵıê×¼»¯£¬complete=false ²»²»È« short=true Ê¡ÊÐÇø·µ»Ø¼òÆ´
+ public static def addressStructure(def city, def address){
+ def jsonObj = null
+ def content = null
+ try {
+ if(address){
+ address = address.replace("{","")
+ def url = "http://192.168.0.19:31080/FangJiaAddressService/structure/v2?address="+URLEncoder.encode(address,"UTF-8")
+ if(city){
+ url = url +"&city="+URLEncoder.encode(city,"UTF-8")
+ }
+ content = new HttpRequest().newGet(url, null, "utf-8")
+ jsonObj = JSONObject.fromObject(content)
+ }
+ } catch (Exception e) {
+ println address +" "+content
+ e.printStackTrace();
+ }
+ return jsonObj;
+ }
+
public static def arroundPrice(city,address){
def jsonObj = null
def content = null
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(){
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 b63201d66..24f03c7cc 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
@@ -38,13 +38,13 @@ public class BeiKeCrawlByChrome {
def task = new BeiKeCrawlByChrome();
task.run()
// task.run1()
- task.addDealRegion();
+// task.addDealRegion();
}
def run(){
- System.setProperty("webdriver.chrome.driver", "D:\\Program Files\\chrome-driver\\chromedriver.exe");
+ System.setProperty("webdriver.chrome.driver", "C:\\Program Files\\Google\\Chrome\\Application\\chromedriver.exe");
System.setProperty("http.nonProxyHosts", "localhost");
WebDriver driver = new ChromeDriver()
@@ -240,7 +240,7 @@ public class BeiKeCrawlByChrome {
def price = e.select(".totalPrice .number").text()
if (price && price.isNumber()) {
- detail.total_price = price.toInteger() * 10000
+ detail.total_price = (int)(price.toDouble() * 10000)
}
if (detail.total_price && detail.area) {
@@ -398,7 +398,7 @@ public class BeiKeCrawlByChrome {
if(cityEles){
for(def e : cityEles){
def href = e.attr("href")
-// if(e.text().contains("ºÏ·Ê")){
+// if(e.text().contains("¸£ÖÝ")){
def cityMap = [:]
cityMap.city = e.text()
cityMap.url = "https:"+href
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy
index c902929c4..0ecdddeb1 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy
@@ -38,7 +38,7 @@ public class LianjiaCrawlByChrome {
task.run()
// task.run1()
// task.addDealRegion();
- task.standardRegion()
+// task.standardRegion()
// task.updadteDealPriceField()
}
@@ -117,7 +117,7 @@ public class LianjiaCrawlByChrome {
}
def run(){
- System.setProperty("webdriver.chrome.driver", "D:\\Program Files\\chrome-driver\\chromedriver.exe");
+ System.setProperty("webdriver.chrome.driver", "C:\\Program Files\\Google\\Chrome\\Application\\chromedriver.exe");
System.setProperty("http.nonProxyHosts", "localhost");
WebDriver driver = new ChromeDriver()
def cityMap = getAllCityUrls(driver)
@@ -316,7 +316,7 @@ public class LianjiaCrawlByChrome {
def price = e.select(".totalPrice .number").text()
if (price && price.isNumber()) {
- detail.total_price = price.toInteger() * 10000
+ detail.total_price = (int)(price.toDouble() * 10000)
}
if (detail.total_price && detail.area) {
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy
index 83ceb7171..cfc3ad6d2 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiDataSend.groovy
@@ -38,8 +38,8 @@ class PaimaiDataSend {
// task.jdRunByMongo()
// task.aliZcRun()
- task.aliZcRun2()
-// task.aliFpRun()
+// task.aliZcRun2()
+ task.aliFpRun()
// task.rmfysszcRun()
// task.jdRun()
// task.checkUrl()
@@ -334,10 +334,10 @@ class PaimaiDataSend {
def index = 0
def q = new BasicDBObject()
// q.put("city",new BasicDBObject('$in', ["ÄϾ©","ËÞǨ","ËÕÖÝ"]))
- q.put("province","½ËÕ")
- q.put("sub_type","ÍÁµØ")
+// q.put("province","½ËÕ")
+// q.put("sub_type","ÍÁµØ")
// q.put("parser_status", new BasicDBObject('$ne',2))
- q.put("url","https://susong-item.taobao.com/auction/671320162557.htm")
+ q.put("url","https://sf-item.taobao.com/sf_item/673646300374.htm")
//https://sf-item.taobao.com/sf_item/657131607486.htm
// q.put("parser_status", new BasicDBObject('$exists',false))
// q.put("finishDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-09-01")))
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy
new file mode 100644
index 000000000..3b8227240
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy
@@ -0,0 +1,174 @@
+package com.fangjia.script.gj.test
+
+import com.fangjia.core.util.DataUtil
+import com.fangjia.script.gj.ccb.FileUtils
+import com.fangjia.script.util.DateUtils
+import com.fangjia.script.util.ElasticUtils
+import com.fangjia.script.util.ExcelUtils
+import com.fangjia.script.util.OpenApiClient
+import net.sf.json.JSONObject
+import org.elasticsearch.index.query.QueryBuilder
+import org.elasticsearch.index.query.QueryBuilders
+
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicLong
+
+class DongGuangApiTest {
+
+ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30)
+
+ static main(args) {
+ def task = new DongGuangApiTest()
+ task.run()
+ }
+
+ def run(){
+ // def rets = findEsData();
+ def rets = readTxt("D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÒøÐÐ (1).csv")
+ println "ES ¼ÓÔØÍê³É"
+ def datas = evaluation(rets)
+ println "ÖØ¹ÀÍê³É"
+// ExcelUtils.write("D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÖعÀ.xlsx", datas, "Êý¾Ý")
+ FileUtils.batchCreateFile(datas, "D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÖعÀ.txt", [], "utf-8", true);
+ println "txt Éú³É"
+ exportCsv("D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÖعÀ.csv", datas)
+ println "csv Éú³É"
+ }
+
+ def readTxt(def fileName){
+ File file = new File(fileName);
+ def rows = [];
+
+ file.eachLine{
+ def row = it.split("#",-1)
+ if(row && row.size()>=2){
+ def s = row[1]
+ JSONObject result = JSONObject.fromObject(s);
+ rows << result
+ }
+
+ }
+ return rows;
+ }
+
+ def evaluation(rets){
+ def datas = new CopyOnWriteArrayList()
+ def totalCount = new AtomicLong()
+ final CountDownLatch latch = new CountDownLatch(rets.size())
+ for(def i=0;i
+ def paramMap = map.parameter_map
+ rets << paramMap
+ if(rets.size()%10000==0){
+ println "."+ new Date()
+ }
+ })
+ return rets;
+ }
+
+
+ def exportCsv(path, list){
+ File file = new File(path);
+ if (file.exists()){
+ file.delete();
+ }
+ file.append("Óû§ÊäÈë³ÇÊÐ,")
+ file.append("Óû§ÊäÈë³ÇÊÐÇøÓò,")
+ file.append("Óû§ÊäÈë³ÇÊеØÖ·,")
+ file.append("Óû§ÊäÈë³ÇÊÐÃæ»ý,")
+ file.append(System.getProperty("line.separator"));
+ list.each{
+ def d = it;
+ file.append(d[0] + ",","gbk")
+ file.append(d[1] + ",","gbk")
+ file.append(d[2] + ",","gbk")
+ file.append(d[3] + ",","gbk")
+ if(d[4]){
+ file.append(d[4]+",","gbk")
+ }else{
+ file.append(",")
+
+ }
+
+ if(d[5]){
+ file.append(d[5] +",","gbk")
+ }else{
+ file.append(",")
+
+ }
+
+
+ if(d[6]){
+ file.append(d[6] +",","gbk")
+ }else{
+ file.append(",")
+
+ }
+ if(d[7]){
+ file.append(d[7]+",","gbk")
+ }else{
+ file.append(",")
+ }
+ file.append(System.getProperty("line.separator"));
+ }
+ }
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy
index e1976f1cb..ca7c9e388 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy
@@ -3,12 +3,15 @@ package com.fangjia.script.gj.test
import ch.qos.logback.core.db.dialect.DBUtil
import com.fangjia.core.RegionData
import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.district.FangjiaClientUtils
+import com.fangjia.script.gj.district.SeaweedDataMatchProcess
import com.fangjia.script.lixue.util.DBUtils
import com.fangjia.script.util.CommonUtils
import com.fangjia.script.util.DateUtils
import com.fangjia.script.util.DbUtils
import com.fangjia.script.util.ExcelUtils
import com.fangjia.script.util.MongoUtils
+import com.fangjia.script.util.OpenApiClient
import com.mongodb.BasicDBObject
import com.mongodb.DBCollection
import com.mongodb.Mongo
@@ -24,6 +27,75 @@ DBCollection coll = MongoUtils.getCollectionByName("seeds_db", "city_seeds", "1
def ZS_MONGODB_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009";
DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "township", ZS_MONGODB_URL)
+
+DBCollection FANGJIA_AREA_CODE = MongoUtils.getCollectionByName("business", "fangjia_area_code", "mongo.db.fangjia.com")
+DBCollection GUIDING_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "guiding_price", "mongo.db.fangjia.com")
+//ExcelUtils.modify("D:\\Êý¾Ý\\֤ȯ\\¹ú¾ý¼û֤ʧ°ÜÔÒò.xls", { d ->
+//})
+
+
+ExcelUtils.modify("D:\\Êý¾Ý\\֤ȯ\\¹ú¾ý¼û֤ʧ°ÜÔÒò(±ê×¼»¯Ê¡ÊÐÇø).xls", { d ->
+ def info = d['A']
+ if(info && !d['E']){
+ def arrs = info.split("!~")
+ if(arrs && arrs[2] && arrs[3]){
+// def rMap = SeaweedDataMatchProcess.doMatch(d['B'], d['C'], arrs[4], arrs[4]);
+// if(rMap) {
+// d['E'] = rMap.name
+// d['F'] = rMap.id
+// }
+
+ def address = null
+ if(d['G']){
+ address = d['G']
+ }else{
+ address = arrs[4]
+ }
+
+ def jsonObject = OpenApiClient.addressMatch(d['C'], address, "property", false, d['D'], null)
+ if(jsonObject != null && jsonObject.precise!=-1) {
+ d['H'] = jsonObject.get("city")
+ d['I'] = jsonObject.get("district")
+ d['J'] = jsonObject.get("name")
+ d['K'] = jsonObject.get("id")
+ }
+
+// def jsonObj = FangjiaClientUtils.addressStructure(d['B'], arrs[4])
+// if(jsonObj && jsonObj.result) {
+// def street = null
+// def street_number = null
+// if (jsonObj.result.street) {
+// d['E'] = jsonObj.result.street
+// }
+// if (jsonObj.result.streetNumber) {
+// d['F'] = jsonObj.result.streetNumber
+// }
+// d['G'] = jsonObj.result.name
+// }
+
+// def rets = findProinvceAndCityAndRegion(FANGJIA_AREA_CODE, arrs[1], arrs[3])
+// if(rets && rets.size()==1){
+// def obj = rets[0]
+// d['B'] = obj.province
+// d['C'] = obj.fjw_city
+// d['D'] = obj.fjw_district
+// }
+ }
+ }
+});
+//
+//def findProinvceAndCityAndRegion(FANGJIA_AREA_CODE, cityCode, regionCode){
+// def q = new BasicDBObject()
+// q.put("city_code", cityCode.toString().toInteger())
+// q.put("district_code", regionCode.toString().toInteger())
+// def dbcursor = FANGJIA_AREA_CODE.find(q)
+// def rets = []
+// for(def d : dbcursor){
+// rets << d
+// }
+// return rets;
+//}
+
//ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\¹ú¼ÒÐÐÕþÇø»®ÌØÊâ³ÇÊе¼³ö.xlsx",{d->
// def city = RegionData.formatCity(d['E'])
// if(city && !d['J']){
@@ -103,33 +175,33 @@ DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "townshi
// }
//})
-ExcelUtils.modify("D:\\Êý¾Ý\\Ç×ÁÚ\\·¿¼ÛÍøÊ¡ÊÐÇø.xlsx",{d->
- if(!d['D']){
- def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN)
- if(infos && infos.size()==1){
- def info = infos[0]
- d['D'] = info.province_code
- d['E'] = info.area_code
- d['F'] = info.street_code
- }
- }
-})
-
-
-def findTownshipInfo(city, region, coll){
- def q = new BasicDBObject()
- q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE))
- q.put("street_name", Pattern.compile('^.*'+region+'½ÖµÀ.*$', Pattern.CASE_INSENSITIVE))
-
- def dbcursor = coll.find(q)
- def rows = []
- for(def d : dbcursor){
-// if(d.street_name.contains(region)){
- rows << d
+//ExcelUtils.modify("D:\\Êý¾Ý\\Ç×ÁÚ\\·¿¼ÛÍøÊ¡ÊÐÇø.xlsx",{d->
+// if(!d['D']){
+// def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN)
+// if(infos && infos.size()==1){
+// def info = infos[0]
+// d['D'] = info.province_code
+// d['E'] = info.area_code
+// d['F'] = info.street_code
// }
- }
- return rows
-}
+// }
+//})
+//
+//
+//def findTownshipInfo(city, region, coll){
+// def q = new BasicDBObject()
+// q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE))
+// q.put("street_name", Pattern.compile('^.*'+region+'½ÖµÀ.*$', Pattern.CASE_INSENSITIVE))
+//
+// def dbcursor = coll.find(q)
+// def rows = []
+// for(def d : dbcursor){
+//// if(d.street_name.contains(region)){
+// rows << d
+//// }
+// }
+// return rows
+//}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy
index 70082d882..a50827e27 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/SFTP.groovy
@@ -209,4 +209,20 @@ class SFTP {
return isDirExistFlag;
}
+ public long getFileSize(String srcSftpFilePath, ChannelSftp sftp) {
+ long fileSize;//Îļþ´óÓÚµÈÓÚ0Ôò´æÔÚ
+ try {
+ SftpATTRS sftpATTRS = sftp.lstat(srcSftpFilePath);
+ fileSize = sftpATTRS.getSize();
+ } catch (Exception e) {
+ e.printStackTrace()
+ fileSize = -1;//»ñÈ¡Îļþ´óСÒì³£
+ if (e.getMessage().toLowerCase().equals("no such file")) {
+ fileSize = -2;//Îļþ²»´æÔÚ
+ }
+ }
+ return fileSize;
+ }
+
+
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy
index a0c3ec24f..3c5c2a52d 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy
@@ -1,6 +1,7 @@
package com.fangjia.script.temp.shenjian.poi
import com.alibaba.fastjson.JSONObject
+import com.fangjia.script.temp.shenjian.util.BaiDuUtils
import com.fangjia.script.temp.shenjian.util.EsUtils
import com.fangjia.script.temp.shenjian.util.GaoDeUtils
import com.fangjia.script.util.ElasticUtils
@@ -15,25 +16,26 @@ import java.util.concurrent.Executors
*/
class FillLngLat {
- static ExecutorService executorService = Executors.newFixedThreadPool(4)
+// static ExecutorService executorService = Executors.newFixedThreadPool(4)
static void main(String[] args) {
- ElasticUtils.executeSqlQuery("select * from dws_poi where location is not null", { dataT ->
+ ElasticUtils.executeSqlQuery("select * from dws_poi where location is null", { dataT ->
final def data = dataT
- executorService.submit(new Runnable() {
- @Override
- void run() {
+// executorService.submit(new Runnable() {
+// @Override
+// void run() {
println(data)
- def lngLat = GaoDeUtils.parserByGaode(data.city, data.region + data.name + data.address)
+ def lngLat = BaiDuUtils.parserByBaidu(data.city, data.region + data.name + data.address)
+ Thread.sleep(1000)
if (lngLat != null && lngLat.size() == 2 ) {
JSONObject jsonObject = new JSONObject()
jsonObject.put("lon", Double.valueOf(lngLat['lng']))
jsonObject.put("lat", Double.valueOf(lngLat['lat']))
EsUtils.bulkUpdateFieldByIds("dws_poi", "location", jsonObject, Arrays.asList(data.source_id))
}
- }
- })
+// }
+// })
})
- executorService.shutdown()
+ //executorService.shutdown()
}
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/BaiDuUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/BaiDuUtils.groovy
new file mode 100644
index 000000000..e307bf28a
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/BaiDuUtils.groovy
@@ -0,0 +1,48 @@
+package com.fangjia.script.temp.shenjian.util
+
+import com.alibaba.fastjson.JSONObject
+import com.fangjia.core.util.GeoUtils
+import com.fangjia.core.util.HttpRequest
+import com.fangjia.script.util.DataUtil
+import org.apache.commons.lang.StringUtils
+
+/**
+ * °Ù¶È¹¤¾ßÀà
+ *
+ * @author shenjian
+ * @since 2022/10/28
+ */
+class BaiDuUtils {
+
+ def static final String KEY = "6w9SEHS3hnAFjmY2oEhqIDdgvLPKWXu5"
+
+ /**
+ * °Ù¶ÈµØÖ·Äæ½âÎö£¬·µ»Ø¸ßµÂ×ø±ê!!!!!!!!!!!!!!!
+ * @param city
+ * @param address
+ */
+ def static parserByBaidu(def city, def address) {
+ Map params = new HashMap()
+ params.put("city", city)
+ if (StringUtils.isBlank(address)) {
+ return []
+ }
+ params.put("address", address.replaceAll("null", ""))
+ params.put("output", "json")
+ params.put("ak", KEY)
+ params.put("callback", "showLocation")
+
+ String content
+ content = new HttpRequest().get("https://api.map.baidu.com/geocoding/v3/", params, "utf-8")
+ //content = "showLocation&&showLocation({\"status\":0,\"result\":{\"location\":{\"lng\":131.04009309945693,\"lat\":45.78426770180344},\"precise\":1,\"confidence\":70,\"comprehension\":100,\"level\":\"µØ²úÐ¡Çø\"}})"
+ content = content.replaceAll("showLocation&&showLocation\\(", "").replaceAll("\\)", "")
+ JSONObject json = JSONObject.parseObject(content)
+ if (json.status == 0 && json.result && json.result.location) {
+ def bd_lng = json.result.location.lng
+ def bd_lat = json.result.location.lat
+ Map locationMap = GeoUtils.bd09ToGcj02(bd_lat, bd_lng)
+ return ["lng": com.fangjia.core.util.DataUtil.getDoubleRound(6, locationMap['lng']), "lat": com.fangjia.core.util.DataUtil.getDoubleRound(6, locationMap['lat'])]
+ }
+ return []
+ }
+}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy
index 17b02bb6b..2a34dd4b3 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy
@@ -247,6 +247,35 @@ class GaoDeUtils {
return Collections.emptyList()
}
+
+ static List getAmapById2(id){
+ def params = [:]
+ params.id = id
+ params.output = 'json'
+ params.key = "66e6771767ab293ace441553c36621c1"
+ JSONObject json = HttpRequestUtil.getJsonContent("https://restapi.amap.com/v5/place/detail", params);
+ if (json == null) {
+ json = HttpRequestUtil.getJsonContent("https://restapi.amap.com/v5/place/detail", params);
+ }
+ if (json && json.info && json.info == "OK") {
+ try {
+ List ret = JSONObject.parseArray(json.pois.toString(), AmapPoi.class)
+ return ret
+ } catch(Exception ex) {
+ ex.printStackTrace()
+ }
+ } else if (json && json.infocode && json.infocode == "10044") {
+ System.exit(1)
+ } else if (json && json.infocode && json.infocode == "10004") {
+ // ¿ª·¢Õߵĵ¥Î»Ê±¼äÄÚ£¨1·ÖÖÓ£©·ÃÎÊÁ¿³¬ÏÞ£¬±»ÏµÍ³×Ô¶¯·âÍ££¬ÏÂÒ»·ÖÖÓ×Ô¶¯½â·â¡£
+ Thread.sleep(60000)
+ } else if (json && json.infocode && json.infocode == "10017") {
+ // ËùÇëÇóµÄ×ÊÔ´²»¿ÉÓÃ
+ System.exit(1)
+ }
+ return Collections.emptyList()
+ }
+
/**
* »ñÈ¡ÏêÇé
*/
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy
index 91d3dee7e..b5f86bf1b 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy
@@ -91,11 +91,9 @@ class DataStandardBatch extends BaseBatch{
// ThirdPartPriceDataRepeatBatchUtils.findThirdPriceDataRepeatBatch(SHORT_DATE, thirdPartyColl)
cityMap.each{city,alias->
-// if(city == "±±¾©"){
- println "¿ªÊ¼¼ÓÔØ¡¾${city}¡¿"
- def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"])
- districtMap.putAll(detailMap)
-// }
+ println "¿ªÊ¼¼ÓÔØ¡¾${city}¡¿"
+ def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"])
+ districtMap.putAll(detailMap)
}
while(flag){
@@ -502,6 +500,8 @@ class DataStandardBatch extends BaseBatch{
type = 12;//ÇøÓò²»Í¬
district = null;
}else{
+ def score = CosineSimilarAlgorithm.getSimilarity(district.name, copyObj.name)
+ district.score = score //´Ë´¦ÓÃÀ´×ö²âÊÔ
type=15
}
}
@@ -920,9 +920,9 @@ class DataStandardBatch extends BaseBatch{
def findAllNoMatchData(){
DBObject qdata = new BasicDBObject();
qdata.put("s_date", SHORT_DATE)
-// qdata.put("city","±±¾©")
+// qdata.put("city","¸£ÖÝ")
// qdata.put("source","°²¾Ó¿Í")
-// qdata.put("name",Pattern.compile("½ðÓçÀ½Íå.*"))
+// qdata.put("name",Pattern.compile("¹¨¼ÒÕ¬.*"))
qdata.put("status", new BasicDBObject(QueryOperators.EXISTS, false));
def ret = []
try{
@@ -1065,6 +1065,9 @@ class DataStandardBatch extends BaseBatch{
udata2.put("match_region", district.region);
udata2.put("match_name", district.name);
udata2.put("match_address", district.address);
+ if(district.score){
+ udata2.put("score", district.score);
+ }
udata2.put("avg_price", data.avg_price);
udata2.put("type", type);
udata2.put("tid", data._id.toString());
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy
index e76898c7f..62e2524e9 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy
@@ -40,11 +40,11 @@ class DataStat {
def run(){
- def source = "°²¾Ó¿Í"//
- def citys = findCrawlCity(source, 202208);
+ def source = "365ÌÔ·¿"//
+ def citys = findCrawlCity(source, 202211);
for(def city : citys){
- def count1 = findCount(source, city, 202208);
- def count2 = findCount(source, city, 202209);
+ def count1 = findCount(source, city, 202211);
+ def count2 = findCount(source, city, 202212);
println city +" "+count1+" "+count2
// println count1
// println "--- ----"
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy
index f954743e4..dce00a5fa 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy
@@ -24,8 +24,9 @@ class SynchDistrictPrice extends BaseBatch{
// "anjuke.com":"°²¾Ó¿Í","cityhouse.cn":"³ÇÊз¿²ú","zhuge.com":"Öî¸ðÕÒ·¿","5i5j.com":"ÎÒ°®ÎÒ¼Ò","jiwu.com":"¼ªÎÝ"]
def sourceMap = ["ke.com":"±´¿ÇÕÒ·¿","cityhouse.cn":"³ÇÊз¿²ú"]
- // "¼ªÎÝ":"¼ªÎÝ","365ÌÔ·¿":"365ÌÔ·¿","ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","±´¿Ç":"±´¿ÇÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï","ÖÐԵزú":"ÖÐԵزú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","C21":"C21","³ÇÊз¿²ú":"³ÇÊз¿²ú"
- def esSources = ["ÖÐԵزú":"ÖÐԵزú"]
+ // "¼ªÎÝ":"¼ªÎÝ","365ÌÔ·¿":"365ÌÔ·¿","ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","±´¿Ç":"±´¿ÇÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï",
+ // "ÖÐԵزú":"ÖÐԵزú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","C21":"C21","³ÇÊз¿²ú":"³ÇÊз¿²ú","Íò©Ê¿PC¶Ë":"Íò©Ê¿"
+ def esSources = ["ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Íò©Ê¿PC¶Ë":"Íò©Ê¿","¼ªÎÝ":"¼ªÎÝ","±´¿ÇÕÒ·¿":"±´¿ÇÕÒ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","365ÌÔ·¿":"365ÌÔ·¿","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï","ÖÐԵزú":"ÖÐԵزú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","C21":"C21","³ÇÊз¿²ú":"³ÇÊз¿²ú"]
static main(args) {
@@ -145,7 +146,7 @@ class SynchDistrictPrice extends BaseBatch{
println "["+source +"-"+city + "] add:"+ rets.size()+" Ôץȡ£º"+count
}else{
for(def r : rets){
- def obj= findIsExists(r.city, r.region, r.name, r.estate_type, SHORT_DATE, source)
+ def obj= findIsExists(r.city, r.region, r.name, SHORT_DATE, source)
if(obj){
updateIndex++
// thirdPartyColl.remove(new BasicDBObject('_id',obj._id))
@@ -183,16 +184,14 @@ class SynchDistrictPrice extends BaseBatch{
}
- def findIsExists(def city, def region, def name, estate_type, def sDate, def source){
+ def findIsExists(def city, def region, def name, def sDate, def source){
def q = new BasicDBObject()
q.put("source", source)
q.put("s_date", sDate)
q.put("city", city)
q.put("region", region)
q.put("name", name)
- if(estate_type){
- q.put("estate_type",estate_type)
- }
+
def obj = thirdPartyColl.findOne(q)
return obj
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy
index 99355ab2a..df803e640 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy
@@ -14,8 +14,8 @@ class TestCrawlTotalCount {
def run(){
def sources = ["·¿¹À¹À","Öî¸ðÕÒ·¿","°²¾Ó¿Í","ËÑ·¿","ÖÐԵزú","¸Ï¼¯","Á´¼Ò","Íò©Ê¿","³ÇÊз¿²ú","±´¿ÇÕÒ·¿","Q·¿","Q·¿(ÐÂ)","ÖÐԵزú(ÐÂ)","ÀÖÓмÒ","ÀÖÓмÒ(ÐÂ)","·¿Ì½","·¿¶à¶à","С×ʼÒ","ÎÒ°®ÎÒ¼Ò","ÂóÌï","·¿Í¾","C21","ÀÖ¾Ó","·¿²ú³¬ÊÐ","58ͬ³Ç","365ÌÔ·¿","¼ªÎÝ"]
for(def source :sources){
- def count1 = findTotalCount(source, 202208);
- def count2 = findTotalCount(source, 202209);
+ def count1 = findTotalCount(source, 202211);
+ def count2 = findTotalCount(source, 202212);
println source +" "+count1 +" "+count2
}
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy
index 3efe71b67..320e65b2f 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy
@@ -81,8 +81,8 @@ class ThirdDataToGatherBatch extends BaseBatch{
println "Ð¡ÇøÌí¼Ó¼Û¸ñÍê³É"
districts = addOtherWebsitePrice(districts);
println "Ð¡ÇøÌí¼ÓµÚÈý·½¼Û¸ñÍê³É"
- districts = addLevel(districts);
- println "Ð¡ÇøÆÀ¼¶Íê³É"
+// districts = addLevel(districts);
+// println "Ð¡ÇøÆÀ¼¶Íê³É"
saveOrUpdate(districts);
println city + "±£´æÐÞ¸ÄÍê³É"
toLineDB(city)
@@ -101,16 +101,16 @@ class ThirdDataToGatherBatch extends BaseBatch{
def tempPrice = d.get(field+"_price")
if(!tempPrice){
d.put(field+"_price", m.avg_price.toInteger())
- if(d.fangjia_price && m.avg_price){
- if(d.fangjia_price){
- try{
- d.put(field+"_diff", diffPercent(d.fangjia_price.toInteger(), m.avg_price.toInteger()))
- }catch(Exception e){
- println "dddd"
- }
-
- }
- }
+// if(d.fangjia_price && m.avg_price){
+// if(d.fangjia_price){
+// try{
+// d.put(field+"_diff", diffPercent(d.fangjia_price.toInteger(), m.avg_price.toInteger()))
+// }catch(Exception e){
+// println "dddd"
+// }
+//
+// }
+// }
}
}else{
@@ -208,8 +208,9 @@ class ThirdDataToGatherBatch extends BaseBatch{
query.put("s_date", SHORT_DATE)
DBObject udata = new BasicDBObject()
- udata.put("level",d.level);
- udata.put("last_price", d.last_price);
+// udata.put("level",d.level);
+// udata.put("last_price", d.last_price);
+ udata.put("seaweed_id", d._id.toString())
udata.put("fangjia_price", d.fangjia_price);
fieldMap.each{k,v->
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy
index b18f43f40..9d9f4c2d0 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy
@@ -109,7 +109,8 @@ public class DataUtil {
//System.out.println(isCellPhoneNumber("15221169682"));
//System.out.println(isCellPhoneNumber("12345611123"));
//println getRound(2,125.269);
- println formateAddress("ËÕÖÝ","½ËÕ·56ºÅ");
+// println formateAddress("ËÕÖÝ","½ËÕ·56ºÅ");
+
}
public static String getHanzi(String s) {
@@ -243,7 +244,7 @@ public class DataUtil {
return "";
}
String regEx = "<[^>]*(>)?";
- return str.replaceAll(regEx, "");
+ return str.replaceAll(regEx, " ");
}
public static Pattern nameTags = Pattern.compile('?([^>]*)(\\s|$|>)');
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy
index c30a1353a..242e1b8a1 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy
@@ -221,6 +221,9 @@ class ElasticUtils {
searchHit.getSourceAsMap().put("id", searchHit.getId());
results << searchHit.getSourceAsMap()
}
+ if(results.size()%100000==0){
+ println "."+ new Date()
+ }
SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId);
scrollRequest.scroll(scroll);
searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT);
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy
index 34186b830..ec6fa0a0b 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy
@@ -65,6 +65,8 @@ class MongoUtils {
if (domainUrl == MongoDB_Domain_mongo) {
port == 28017;
}
+
+
if ((domainUrl == "192.168.0.136") && (port == 27017 || port == 28017)) {
return com.fangjia.core.util.MongoUtils.getDbCollection(Constants.TEST_FANGJIA_MONGO_URI, db, name)
}
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy
index 68cd266c8..0d0647082 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy
@@ -52,6 +52,22 @@ public class OpenApiClient {
return false
}
+ public static def search(def city, def district, def name){
+ Map params = new HashMap()
+ params.put("city", city);
+ params.put("keyword", name);
+ params.put("district", district)
+ params.put("token", TOKEN);
+ String content = new HttpRequest().get("http://open.fangjia.com/property/search", params, "utf-8")
+ JSONObject jsonObj = JSONObject.fromObject(content)
+ JSONArray array = jsonObj.get("result")
+ def matchObj = null
+ if(array){
+ matchObj = array[0]
+ }
+ return matchObj
+ }
+
public static List searchDistrict(double lng, double lat, int r, String city) {
DecimalFormat format = new DecimalFormat("#.0000000000");
try {
@@ -348,6 +364,7 @@ public class OpenApiClient {
}
+ //´Ë½Ó¿ÚµØÖ·±ê×¼»¯£¬´ø²¹È«
public static JSONObject standard1Action(String city, String address) {
try {
Map params = new HashMap();
@@ -1088,6 +1105,30 @@ public class OpenApiClient {
return null
}
+ public static JSONObject addressEvaluation(city, region, address, size){
+ try {
+ HttpRequest request = new HttpRequest();
+ Map params = new HashMap();
+ params.put("city", city);
+ params.put("district", region);
+ params.put("address", address);
+ params.put("size", String.valueOf(size));
+ params.put("token", TOKEN);
+ String response = request.get("http://open.fangjia.com/property/addressEvaluate", params, "UTF-8");
+ JSONObject result = JSONObject.fromObject(response);
+ if (result.getInt("code") == 200) {
+ if (result.containsKey("result")) {
+ return result.getJSONObject("result")
+ }
+ } else if (result.getInt("code") == 500) {
+ println("µØÖ·¹À¼Ûʧ°Ü:${city} ${address} ${size} ${result}")
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null
+ }
+
public static JSONObject evaluateDistrictPriceByAddress(String city, String address, double size) {
try {
HttpRequest request = new HttpRequest();
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy
index 8bca701d7..04e45fb88 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy
@@ -11,8 +11,8 @@ import org.bson.Document
import static com.mongodb.client.model.Filters.*
MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log")
-def startDate = DateUtil.parseDate("20220601", "yyyyMMdd")
-def endDate = DateUtil.parseDate("20220701", "yyyyMMdd")
+def startDate = DateUtil.parseDate("20220901", "yyyyMMdd")
+def endDate = DateUtil.parseDate("20221001", "yyyyMMdd")
Calendar calendar = Calendar.getInstance()
calendar.setTime(startDate)
def count = 0
@@ -25,7 +25,7 @@ while (startDate.before(endDate)) {
OPEN_URI_LOG.find(and(eq("user_id", "1007705"), eq("request_uri", "/property/detail"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc ->
def result = JSONObject.fromObject(doc.res_map.result)
if (!hashSet.contains(result)) {
- def item = ["60a3202c0b42a00001aad385", "qlkjgx", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()]
+ def item = ["60a3202c0b42a00001aad385", "qlkj", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()]
data << item
hashSet << result
} else {
@@ -38,4 +38,6 @@ while (startDate.before(endDate)) {
startDate = nextDate
}
-ExcelUtils.write("D:\\Ç×ÁÚÊý¾Ý${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾")
\ No newline at end of file
+ExcelUtils.write("D:\\Ç×ÁÚÊý¾Ý${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾")
+
+
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java
index 543a2f6ce..db0bfca4b 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java
@@ -82,7 +82,6 @@ import com.fangjia.service.util.ServiceUtil;
import com.fangjia.service.web.FangjiaHighlighter;
import com.fangjia.service.web.MenuService;
-import javax.jws.WebService;
public class DistrictServiceImpl implements DistrictService {
/**
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/map/AMapAddressServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/map/AMapAddressServiceImpl.java
index 13a75b35c..eec1baff6 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/map/AMapAddressServiceImpl.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/map/AMapAddressServiceImpl.java
@@ -1,25 +1,12 @@
package com.fangjia.service.map;
-import com.alibaba.fastjson.JSON;
import com.fangjia.core.util.HttpRequest;
-import com.fangjia.core.util.SourceNameUtil;
-import com.fangjia.core.util.StringUtil;
-import com.fangjia.dal.mongo.address.dao.AMapAddressDao;
-import com.fangjia.dal.mongo.address.dao.AMapAddressDaoImpl;
import com.fangjia.dal.mongo.address.model.AMapAddressPOIResult;
import com.fangjia.service.bo.*;
import com.fangjia.service.bo.map.*;
-import com.fangjia.service.util.ABYun.ABuYunUtil;
-import com.fangjia.service.util.AmapUtil;
-import com.huaban.analysis.jieba.JiebaSegmenter;
-import net.sf.ezmorph.array.AbstractArrayMorpher;
-import net.sf.ezmorph.array.BooleanObjectArrayMorpher;
-import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.lucene.util.CollectionUtil;
-import org.omg.CORBA.OBJ_ADAPTER;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java
index e0e763666..d849f26c6 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java
@@ -7,12 +7,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.fangjia.core.util.CacheUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.sql.dao.UserDao;
import com.fangjia.dal.sql.model.User;
+import org.sothis.core.util.Closure;
public class UserServiceImpl implements UserService {
private UserDao userDao;
@@ -28,10 +30,15 @@ public class UserServiceImpl implements UserService {
return Collections.emptyList();
}
- public User findByUserName(String userName) {
- List params = new ArrayList(1);
- params.add(new QueryParam("userName", userName));
- return userDao.findFirstByParams(params);
+ public User findByUserName(final String userName) {
+ return CacheUtils.getValue(UserServiceImpl.class, "findByUserName", userName, CacheUtils.CachePolicyEnum.TODAY, new Closure(){
+ @Override
+ public User execute(String input) {
+ List params = new ArrayList(1);
+ params.add(new QueryParam("userName", userName));
+ return userDao.findFirstByParams(params);
+ }
+ });
}
public void updateUser(User user) {
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-1.png
new file mode 100644
index 000000000..66d55a322
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-1.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-2.png
new file mode 100644
index 000000000..382154474
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-2.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-3.png
new file mode 100644
index 000000000..8a14fb5d4
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-3.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-4.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-4.png
new file mode 100644
index 000000000..bc327abbe
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-4.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-5.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-5.png
new file mode 100644
index 000000000..2b75938af
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-5.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level_banner.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level_banner.png
new file mode 100644
index 000000000..799dbdf79
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level_banner.png differ