From fbc2698c2bc6b3a6ed5940ed865e64203f42aa0a Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sat, 20 Apr 2024 15:05:16 +0800 Subject: [PATCH] update --- .../ccbevaluation/BigdataDealBatch.groovy | 8 +- .../ccbevaluation/CcbCommonUtils.groovy | 2 +- .../script/gj/data_handle/DevProcess.groovy | 127 ++++++++++++++---- .../FjwGuiDingPriceBatch.groovy | 2 +- 4 files changed, 113 insertions(+), 26 deletions(-) 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 9b22ad4b9..210e810a2 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 @@ -34,7 +34,7 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class BigdataDealBatch extends BaseBatch{ - def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -60, "yyyyMM")); + def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -24, "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")); @@ -68,6 +68,8 @@ class BigdataDealBatch extends BaseBatch{ for(def city : allCitys){ addDealPriceMatch(city); } +// updateCrawlTradeDate()//修改后抓取的成交,将时间改为本月 + // def rows = [] // def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] @@ -679,6 +681,10 @@ class BigdataDealBatch extends BaseBatch{ return map } + def updateCrawlTradeDate(){ + + } + def addDealPriceMatch(city){ // def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd")) 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 83c9ec794..84f840c02 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 @@ -678,7 +678,7 @@ class CcbCommonUtils { } public static def deleteGuidedPrice(def dealdate){ - def sql2 = "delete from base.guided_price where gujia_drc_dt='${dealdate}'" + def sql2 = "delete from base.t0831_guided_price_gj_h where gujia_drc_dt='${dealdate}'" pgsqlInstance.executeUpdate(sql2) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy index 374ad79bd..aa7425f23 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data_handle/DevProcess.groovy @@ -29,7 +29,8 @@ class DevProcess { def task = new DevProcess(); // task.run() // task.parseCityAndDist() - task.devSplitRoad() +// task.devSplitRoad() + task.devNameSplitRoad() // task.addFlag() // task.matchDev() @@ -37,15 +38,17 @@ class DevProcess { // task.updateCityAndDist() // task.addDevAddres1() //按添加地址中包含开发区名称的地址 // task.addDevAddres2()//添加相差2公里范围内的地址 +// task.matchDevAndAddAddress() // task.stat() // task.addNewDev() // task.createDevMapping() // task.deleteAddr() // task.synchDevTo43() - } + + def parseCityAndDist(){ ExcelUtils.multiThreadingModify("D:\\数据\\数据建设\\等级开发区.xlsx",{d-> if(!d['J']){ @@ -160,11 +163,11 @@ class DevProcess { } def devSplitRoad(){ - def i = 1; - while(i<13){ + def i = 10; + while(i<11){ def fileName = "/home/goojia/gj/company-${i}.xlsx" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\数据建设\\第二批公司-${i}.xlsx" + fileName = "D:\\数据\\数据建设\\company-${i}.xlsx" } ExcelUtils.multiThreadingModify(fileName,{d-> /*if(d['C'] && !d['V']){ @@ -192,30 +195,33 @@ class DevProcess { }*/ if(d['C'] && d['B']!='河北省'){ def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(null, d['C']) - def street = jsonObject.get("street") - def streetNumber = jsonObject.get("streetNumber") - if(jsonObject.get("province") && jsonObject.get("province")!="null"){ - d['J'] = jsonObject.get("province") - } + if(jsonObject){ + def street = jsonObject.get("street") + def streetNumber = jsonObject.get("streetNumber") + if(jsonObject.get("province") && jsonObject.get("province")!="null"){ + d['J'] = jsonObject.get("province") + } - if(jsonObject.get("city") && jsonObject.get("city")!="null"){ - d['K'] = jsonObject.get("city") - } + if(jsonObject.get("city") && jsonObject.get("city")!="null"){ + d['K'] = jsonObject.get("city") + } - if(jsonObject.get("district") && jsonObject.get("district")!="null"){ - d['L'] = jsonObject.get("district") - } + if(jsonObject.get("district") && jsonObject.get("district")!="null"){ + d['L'] = jsonObject.get("district") + } - if(jsonObject && street && streetNumber && street!="null"){ - d['M'] = jsonObject.get("street") - if(streetNumber!='null'){ - d['N'] = jsonObject.get("streetNumber") + if(jsonObject && street && streetNumber && street!="null"){ + d['M'] = jsonObject.get("street") + if(streetNumber!='null'){ + d['N'] = jsonObject.get("streetNumber") + } + } + + if(jsonObject.get("dev") && jsonObject.get("dev")!="null"){ + d['O'] = jsonObject.get("dev") } } - if(jsonObject.get("dev") && jsonObject.get("dev")!="null"){ - d['O'] = jsonObject.get("dev") - } } },0) i++ @@ -223,6 +229,47 @@ class DevProcess { } + + + def devNameSplitRoad(){ + def fileName = "/home/goojia/gj/company.xlsx" + if(CommonDatautils.isWindow()){ + fileName = "D:\\数据\\数据建设\\开发区\\河北省开发区.xlsx" + } + ExcelUtils.multiThreadingModify(fileName,{d-> + if(d['P'] && d['P']=="路正常" && !d['O']){ + def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['E']) + if(jsonObject){ + def street = jsonObject.get("street") + def streetNumber = jsonObject.get("streetNumber") + if(jsonObject.get("province") && jsonObject.get("province")!="null"){ + d['J'] = jsonObject.get("province") + } + + if(jsonObject.get("city") && jsonObject.get("city")!="null"){ + d['K'] = jsonObject.get("city") + } + + if(jsonObject.get("district") && jsonObject.get("district")!="null"){ + d['L'] = jsonObject.get("district") + } + + if(jsonObject && street && streetNumber && street!="null"){ + d['M'] = jsonObject.get("street") + if(streetNumber!='null'){ + d['N'] = jsonObject.get("streetNumber") + } + } + + if(jsonObject.get("dev") && jsonObject.get("dev")!="null"){ + d['O'] = jsonObject.get("dev") + } + } + + } + },0) + } + def addFlag(){ ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\企业园区地址.xlsx",{d-> if(d['H'] && d['D']){ @@ -509,4 +556,38 @@ class DevProcess { } DEVELOPMENT_ZONE_43_COLL.insert(rets) } + + + def matchDevAndAddAddress(){ + ExcelUtils.modify("D:\\数据\\数据建设\\开发区\\河北省开发区.xlsx",{d-> + if(d['P'] && d['P']=="路正常" && d['O']){ + def q = new BasicDBObject() + q.put("name", d['O']) + def obj = development_zone_CONN.findOne(q) + if(obj){ + + d['Q'] = obj._id.toString() + d['R'] = obj.name + def address = d['M']+d['N'] + q.put("address", address) + def sameObj = DEV_MAPPING_CONN.findOne(q) + if(!sameObj){ + def udata = new BasicDBObject() + udata.put("province", obj.province) + if(obj.city){ + udata.put("city", obj.city) + } + if(obj.district){ + udata.put("district", obj.district) + } + + udata.put("name",obj.name) + udata.put("type", "地址") + udata.put("address", address) + DEV_MAPPING_CONN.save(udata) + } + } + } + },0); + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy index 8e494f407..a528b4f9c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwGuiDingPriceBatch.groovy @@ -53,7 +53,7 @@ class FjwGuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2022-03-01", "2022-04-01") + def prices = CcbCommonUtils.findPersonPrice(city, "2024-04-01", "2024-05-01") if(prices){ def distMap = getDistrictMap(city) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)