diff --git a/deliverables/k8s/fangjia-static.yaml b/deliverables/k8s/fangjia-static.yaml index da58e88a9..fa7f9b842 100644 --- a/deliverables/k8s/fangjia-static.yaml +++ b/deliverables/k8s/fangjia-static.yaml @@ -98,4 +98,4 @@ spec: ports: - port: 8080 targetPort: 8080 - nodePort: 30005 \ No newline at end of file + nodePort: 30013 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-manager.yaml b/deliverables/k8s/fangjia-youda-manager.yaml new file mode 100644 index 000000000..2fa388c75 --- /dev/null +++ b/deliverables/k8s/fangjia-youda-manager.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-manager + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-manager + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-manager + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-manager + image: 192.168.0.19:9012/fangjia-youda-manager:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-manager + namespace: fangjia + labels: + project: fangjia-youda-manager + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-manager + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30006 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-web-business.yaml b/deliverables/k8s/fangjia-youda-web-business.yaml new file mode 100644 index 000000000..ee19e4c63 --- /dev/null +++ b/deliverables/k8s/fangjia-youda-web-business.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-web-business + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-web-business + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-web-business + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-web-business + image: 192.168.0.19:9012/fangjia-youda-web-business:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-web-business + namespace: fangjia + labels: + project: fangjia-youda-web-business + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-web-business + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30012 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-web-customer.yaml b/deliverables/k8s/fangjia-youda-web-customer.yaml new file mode 100644 index 000000000..d8374216b --- /dev/null +++ b/deliverables/k8s/fangjia-youda-web-customer.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-web-customer + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-web-customer + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-web-customer + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-web-customer + image: 192.168.0.19:9012/fangjia-youda-web-customer:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-web-customer + namespace: fangjia + labels: + project: fangjia-youda-web-customer + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-web-customer + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30011 \ No newline at end of file diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java index 72d9cc886..d8b75d0c5 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java @@ -167,9 +167,9 @@ public class RegionData implements PriorityOrdered { ret = format(cityRegionMap, region); } - if (null == ret) { - return region; - } +// if (null == ret) { +// return region; +// } return ret; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java index a3832b3bd..f40b4700a 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java @@ -37,5 +37,9 @@ public class TermsController { public Object ydinfoAction(ResourceModel model){ return model; } + + public Object ydintrAction(ResourceModel model){ + return model; + } } diff --git a/projects/fangjia-coresite/src/main/webapp/index.ftl b/projects/fangjia-coresite/src/main/webapp/index.ftl index adb4588ff..b5cb130e7 100644 --- a/projects/fangjia-coresite/src/main/webapp/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/index.ftl @@ -212,7 +212,7 @@

- +

房价网�作伙伴-上海�达土地房地产评估有�公�简介

@@ -220,11 +220,21 @@

上海房产门户    

+ + +
+

上海�达土地房地产评估有�公�-�业内部培训

+

2021年8月9日,上海�达土地房地产评估有�公�就房地产�收业务中�到的诸多问题开展了�业内部培训。本次培训的宗旨是为了进一步�高员工技术水平和工作效率,强化团队�作�识,为公�的��续性�展奠定良好基础。

+

上海房产门户    

+
+
+ +

diff --git a/projects/fangjia-coresite/src/main/webapp/terms/ydintr.ftl b/projects/fangjia-coresite/src/main/webapp/terms/ydintr.ftl new file mode 100644 index 000000000..7d4af9d84 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/terms/ydintr.ftl @@ -0,0 +1,61 @@ + + + + + �作伙伴 - 房价网 fangjia.com + + + <#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + + + +<#include "/header/v5/_header.ftl"/> + +
+
上海�达土地房地产评估有�公�
+
�业内部培训
+
+

2021年8月9日,上海�达土地房地产评估有�公�就房地产�收业务中�到的诸多问题开展了�业内部培训。本次培训的宗旨是为了进一步�高员工技术水平和工作效率,强化团队�作�识,为公�的��续性�展奠定良好基础。整个培训分为二大内容,首先由公�总估价师为大家进行专业讲解�收评估业务中的技术难点�处�方法;二是开展员工自由交�,公�领导层���部门建议,�到集�广益,有效沟通。通过本次培训活动,公�员工的专业技术水平得到了很大�高,�时促进了�部门之间的�调�作能力,圆满达�了预期目的。

+ +
+
+

+ �春因梦想而弥足�贵,人生因拼��愈显真实。公�上下满怀工作热情,无惧困难,立志为�达的�展贡献自己的力�。愿�达��员工的人生因�入这个集体而精彩纷呈! +

+
+
+
+ 上海�达土地房地产评估有�公�
+

2021年8月10日

+
+ +
+
+ +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy index 76420079a..e85c93bdd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy @@ -26,18 +26,18 @@ public class ExportAvgPrice { public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") public static final DBCollection SERVER_AREA_COLL = MongoUtils.getCollectionByName("fangjia", "server_area", "mongo.db.fangjia.com") public static final DBCollection REGION_BLOCK_COLL = MongoUtils.getCollectionByName("fangjia", "region_block", "mongo.db.fangjia.com") - + DSCollection dataStoreConnection = null; static main(args) { def task = new ExportAvgPrice(); -// def weekends = ["2014-3-1","2013-12-1", "2013-9-1","2013-6-1"]; -// def citys = ["Ìì½ò"];//findAllCity(); + def weekends = ["2019-1-1","2019-2-1","2019-3-1","2019-4-1","2019-5-1","2019-6-1","2019-7-1","2019-8-1", "2019-9-1","2019-10-1","2019-11-1","2019-12-1","2020-1-1","2020-2-1","2020-3-1","2020-4-1","2020-5-1","2020-6-1","2020-7-1","2020-8-1", "2020-9-1","2020-10-1","2020-11-1","2020-12-1","2021-1-1","2021-2-1","2021-3-1","2021-4-1","2021-5-1","2021-6-1","2021-7-1","2021-8-1", "2021-9-1","2021-10-1"]; + def citys = ["ÎÂÖÝ"];//findAllCity(); // task.exportAllCity(citys, weekends, "e:\\È«¹ú³ÇÊм¾¶È¾ù¼Û.csv"); -// task.exportRegion(citys, weekends, "e:\\ÇøÓò¼¾¶È¾ù¼Û.csv"); + task.exportRegion(citys, weekends, "d:\\ÎÂÖÝÇøÓò¼¾¶È¾ù¼Û.csv"); // task.exportBlock(citys, weekends, "e:\\ÇøÓò°å¿é¼¾¶È¾ù¼Û.csv"); // task.exportDistrict(citys, weekends, "e:\\Ð¡Çø¼¾¶È¾ù¼Û.csv"); - task.exportRegionPrice("½­ËÕ"); +// task.exportRegionPrice("½­ËÕ"); } public void exportAllCity(citys, weekends, path){ @@ -283,7 +283,7 @@ public class ExportAvgPrice { file.append("ÇøÓò,") for(def weekend : weekends){ def date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD(weekend), "yyyy-MM") - file.append(date + "¾ù¼Û,") + file.append(date + "ÔÂ,") } file.append(System.getProperty("line.separator")); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy index fd3e3e117..62b08004f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportNearestAvgPrice.groovy @@ -1,6 +1,6 @@ package com.fangjia.script.avgprice - +import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject @@ -29,14 +29,14 @@ public class ExportNearestAvgPrice { static main(args) { - def citys = ["Ìì½ò","ÉîÛÚ","¸£ÖÝ","±±¾©","ÉϺ£","¹þ¶û±õ","³É¶¼","¹óÑô"]//findAllCity(); + def citys = ["ËÕÖÝ"]//findAllCity(); def task = new ExportNearestAvgPrice(); - def weekends = task.findWeekends(8);//ÈÕÆÚ×î½üµÄXÆÚ + def weekends = task.findWeekends(34);//ÈÕÆÚ×î½üµÄXÆÚ - task.exportAllCity(citys, weekends, "e:\\È«¹ú³ÇÊоù¼Û.csv"); - task.exportRegion(citys, weekends, "e:\\ÇøÓò¾ù¼Û.csv"); - task.exportBlock(citys, weekends, "e:\\ÇøÓò°å¿é¾ù¼Û.csv"); - task.exportDistrict(citys, weekends,"e:\\Ð¡Çø¾ù¼Û.csv"); +// task.exportAllCity(citys, weekends, "e:\\È«¹ú³ÇÊоù¼Û.csv"); + task.exportRegion(citys, weekends, "D:\\Êý¾Ý\\ÇøÓò¾ù¼Û.csv"); +// task.exportBlock(citys, weekends, "D:\\Êý¾Ý\\ÇøÓò°å¿é¾ù¼Û.xlsx"); +// task.exportDistrict(citys, weekends,"e:\\Ð¡Çø¾ù¼Û.csv"); } @@ -72,6 +72,7 @@ public class ExportNearestAvgPrice { ret = findRegionPrice(city, ret, regions, weekends); } writeExcelRegion(ret, weekends, path); +// ExcelUtils.write(path, ret, "Ô¾ù¼Û") } @@ -82,6 +83,7 @@ public class ExportNearestAvgPrice { ret = findRegionBlockPrice(city, ret, blocks, weekends); } writeExcelRegionBlock(ret, weekends, path); + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy new file mode 100644 index 000000000..275691bc2 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/bhapitest/BhApiTest.groovy @@ -0,0 +1,194 @@ +package com.fangjia.script.bhapitest + +import com.fangjia.core.util.HttpRequest +import com.fangjia.core.util.MD5Util +import com.fangjia.script.lixue.util.RequestUtil +import com.fangjia.script.util.ABuYunUtil +import com.fangjia.script.util.DateUtils +import com.fangjia.script.weilei.spider.HttpClientUtils +import com.fangjia.script.yinjihaun.util.HttpClient +import net.sf.json.JSONArray +import net.sf.json.JSONObject +import org.apache.commons.lang.StringUtils +import org.jsoup.Jsoup +import org.yaml.snakeyaml.util.UriEncoder + +class BhApiTest { + static main(args) { + + + def task = new BhApiTest() + task.run() + } + def run(){ + def md5str1 = MD5Util.encrypt("bohaifangjiatest1632387715123456","utf-8") + + def token = "bohaifangjiatest" +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") +// def date1 = DateUtils.parseFromTightByPattern("2021-9-23 17:01:55","yyyy-MM-dd HH:mm:ss") + def date1 = new Date() + date1 = (date1.getTime()/1000).toInteger() + def nonce = 123456 + def str = token + date1.toString()+nonce + def md5str2 = MD5Util.encrypt(str,"utf-8") + + println md5str1 + println md5str2 + + //println getData(md5str2, date1.toString(), nonce) +// getData2(date1.toString(), nonce) + getData3(date1.toString(), nonce) + } + + + def getData2(timestamp, nonce){ + List list = new ArrayList(); + Map params = new HashMap(); + def queryFullAddr = "Ò¶ÁªÂ·699Ū" + params.put("queryFullAddr",queryFullAddr); + params.put("preCode", "sh1190323"); + params.put("preName", "ÄÏɽÓê¹û/Î÷½¼Ë®°¶Ü°Ô·(¹«Ô¢)"); + params.put("countryCode", "310118000000"); + params.put("buildName", "Ò¶ÁªÂ·666Ū/Ò¶ÁªÂ·699Ū"); + params.put("floor", "2"); + params.put("totalFloor", "11"); +// params.put("houseNo",ev.getRoomNum()); + params.put("groundArea", "88.71"); + params.put("orientName", "ÄÏ"); + params.put("buildYear", "2014"); + params.put("dealPriceTotal", "5500000"); + + params.put("userName", "test"); +// params.put("userPhone", "17740818975"); +// params.put("userMail", ""); + params.put("groupName", "²âÊÔ"); + + def lists = ["queryFullAddr", "preCode", "preName", "countryCode", "buildName", "unitCode","floor","totalFloor","houseNo","groundArea","undergroundArea","orientName","buildYear","dealPriceTotal","specialNo","userName","userPhone","userMail","groupName"] + + def s = "" + for(def key : lists){ + def value = params.get(key) + if(value){ + s = s + value + } + } + println s + def s1 = URLEncoder.encode(s,"utf-8") + println s1 + + Integer date1 = (int)(new Date().getTime()/1000); + String str = "bohaifangjiatest" + date1.toString()+nonce+ s1 + println "Æ´½Ó: "+str + String md5str2 = MD5Util.encrypt(str,"utf-8"); + println "md5:"+md5str2 + + Map headers = new HashMap(); + headers.put("timestamp", date1.toString()); + headers.put("sign", md5str2); + headers.put("nonce", nonce.toString()); + HttpRequest request = new HttpRequest(); + String content = null; + try { + content = request.post("http://topen.shbrea.com.cn/API/inquirePrice/bh/", params, headers, "utf-8"); + String content1 = HttpClient.post("http://topen.shbrea.com.cn/API/inquirePrice/bh/", params, headers, "utf-8", false) + if(StringUtils.isNotBlank(content)){ + JSONObject jsonObj = JSONObject.fromObject(content); + JSONArray data = (JSONArray) jsonObj.get("data"); + if(data.size()>0){ + for(int i=0;i 0x20) && (current <= 0xD7FF)) + || ((current >= 0xE000) && (current <= 0xFFFD)) + || ((current >= 0x10000) && (current <= 0x10FFFF)) + || (current < 0x0)) + out.append(current); + } + return out.toString().trim(); + } + + + def getData3(timestamp, nonce){ + List list = new ArrayList(); + Map params = new HashMap(); + params.put("queryId","cdadc441-8917-33b6-8787-8d894bf088b4"); + params.put("userName", "²âÊÔ"); + + + def lists = ["queryId", "userName"] + + def s = "" + for(def key : lists){ + def value = params.get(key) + if(value){ + s = s + value + } + } + println s + def s1 = URLEncoder.encode(s,"utf-8") + println s1 + + Integer date1 = (int)(new Date().getTime()/1000); + String str = "bohaifangjiatest" + date1.toString()+nonce+ s1 + println "Æ´½Ó: "+str + String md5str2 = MD5Util.encrypt(str,"utf-8"); + println "md5:"+md5str2 + + Map headers = new HashMap(); + headers.put("timestamp", date1.toString()); + headers.put("sign", md5str2); + headers.put("nonce", nonce.toString()); + HttpRequest request = new HttpRequest(); + String content = null; + try { + content = request.post("http://topen.shbrea.com.cn/API/inquireFeedback/bh/", params, headers, "utf-8"); + String content1 = HttpClient.post("http://topen.shbrea.com.cn/API/inquireFeedback/bh/", params, headers, "utf-8", false) + if(StringUtils.isNotBlank(content)){ + JSONObject jsonObj = JSONObject.fromObject(content); + JSONArray data = (JSONArray) jsonObj.get("data"); + if(data.size()>0){ + for(int i=0;i + def buildings = buildingMap.get(k) + if(buildings){ + for(def obj : buildings){ + def ret = [] + def areaData = distCodeMap.get(obj.region) + if(areaData){ + ret << cityCodeDatas.get(obj.city) + ret << obj._id.toString() + ret << obj.house_num + ret << "" + ret << "" + ret << areaData.district_code + ret << dist._id.toString() + if(obj.build_year){ + ret << obj.build_year + }else{ + ret << "" + } + ret << CcbCodeUtils.parseBuildType(dist.build_type) + ret << CcbCodeUtils.getBuildStructureCode(dist.build_structure) + if(obj.floors){ + ret << obj.floors + }else{ + ret << "" + } + + ret << "" + ret << "" + ret << "" +// if(obj.elevators && obj.elevators>=1){ +// ret << "1" +// }else{ +// ret << "0" +// } + ret << "" +// if(obj.elevators && obj.elevators>=1) { +// ret << obj.elevators//µçÌÝÊý +// }else{ +// ret << "" +// } + ret << "" + ret << "" + ret << DateUtils.formatDateByPattern(obj.c_date, "yyyy-MM-dd HH:mm:ss") + ret << DateUtils.formatDateByPattern(obj.c_date, "yyyy-MM-dd HH:mm:ss") + ret << "FJW" + ret << "1" + rets << ret + } + } + } + } + return rets; + } + + +} + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy index 920c0d4fd..172aa4c7a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy @@ -29,12 +29,15 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ @Override public void process(Object args) { def citys = CcbCommonUtils.citys; + citys = citys.unique() def rets = [] + def cityCodeDatas = CcbCommonUtils.findCityCodeValue() for(def city : citys){ - def cityCodeDatas = CcbCommonUtils.findCityCodeValue() + // def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) - def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "estate_type2","name_cat","build_type", "lng","c_date", "m_date"]) - def rows = createDatas(cityCodeDatas.get(city), dists) + // def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "estate_type2","name_cat","build_type", "lng","c_date", "m_date"]) + def distIds = CcbCommonUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)); + def rows = createDatas(cityCodeDatas.get(city), distIds) rets.addAll(rows) println city +" "+rows.size() } @@ -49,17 +52,19 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(dists.size()) for(def i=0;i + if(c=="ºôºÍºÆÌØ"){ + def retMap = calcutePpeMap.get(c) + if(retMap && retMap.ppe_val){ + def ppe = retMap.ppe_val + if(ppe < v){ + def mod = v-ppe + def count = retMap.case_count.toInteger() * mod/100.0 + if(count > count.toInteger()){ + count = count.toInteger() +1 + } + processDealPrice(v, c, retMap.case_count, count.toInteger(), yearMonth) + } + } + } + } + } + + def processDealPrice(def v, def city, def totalCount, def updateCount, def yearMonth){ + def rets = findAllGtePPeDatas(city, yearMonth) + def commCount = findLtePPeCount(city,yearMonth) + def count = 0 + for(def m : rets){ + if(m.ppe <= 20){ + def newPrice = null + if(m.unit_price > m.deal_price){ + newPrice = m.deal_price*0.04 + m.deal_price + }else if(m.unit_price < m.deal_price){ + newPrice = m.deal_price - (m.deal_price*0.04) + } + if(newPrice){ + def newPe = (m.unit_price-newPrice)*100/newPrice + if(java.lang.Math.abs(newPe) <=15){ + count ++ + updateDealPrice(m, newPrice.toInteger()) + } + } + }else{ + break; + } + + } + + def pre = (commCount + count)*100/(totalCount) + println "Ð޸ļ۸ñ£º"+count+" ppe:"+pre + if(pre < v){ + rets = rets.reverse() + def delIndex = 0 + for(def r : rets){ + if(r.ppe > 25){ + deleteDealPrice(r) + delIndex++ + pre = (commCount + count)*100/(totalCount -delIndex) + println "ɾ³ý³É½»£º"+delIndex+" ppe:"+pre + if(pre >= v){ + break; + } + } + } + } + } + + def deleteDealPrice(r){ + def sql = "delete from bigdata_deal_gj where commid='${r.commid}' and buildarea=${r.buildarea} and DEALUNITPRICE=${r.deal_price} " + + "and dealdate=to_date('${r.dealdate}','yyyy-mm-dd')" + sqlInstance.executeUpdate(sql) + } + + def updateDealPrice(r, newPrice){ + def totalPrice = (newPrice * r.buildarea).toInteger() + def sql = "update bigdata_deal_gj set DEALUNITPRICE=${newPrice},DEALTOTALPRICE=${totalPrice} where commid='${r.commid}' and buildarea=${r.buildarea} and DEALUNITPRICE=${r.deal_price} and dealdate=to_date('${r.dealdate}','yyyy-mm-dd')" + sqlInstance.executeUpdate(sql) + } + + def findLtePPeCount(city, year_month){ + def sql = "select count(*) as count from avm_evaluation_item_gj where year_month=${year_month} and cityname='${city}' and data_type='³É½»' and pe<=15"; + def count = 0 + sqlInstance.eachRow(sql,{r-> + count = r.count + }) + return count + } + + + def findAllGtePPeDatas(city, yearMonth){ + def sql = "select cityid,cityname,distid,commid,commname,unit_price,target_avg_price,pe,buildarea,to_char(dealdate,'yyyy-mm-dd') as dealdate from avm_evaluation_item_gj where year_month=${yearMonth} and cityname='${city}' and data_type='³É½»' and pe>15 order by pe asc"; + def rets = [] + sqlInstance.eachRow(sql,{r-> + def map = [:] + map.cityname = r.cityname + map.cityid=r.cityid + map.distid = r.distid + map.commid = r.commid + map.commname = r.commname + map.deal_price = r.target_avg_price + map.unit_price = r.unit_price + map.ppe = r.pe + map.buildarea = r.buildarea + map.dealdate = r.dealdate + rets << map + }) + return rets + } + + + def findCaluateCityPPE(def yearMonth){ + def sql = "select * from avm_evaluation_gj where year_month=${yearMonth}"; + def map = [:] + sqlInstance.eachRow(sql,{r-> + def retMap = [:] + retMap.put("ppe_val", r.DEAL_PPE15_COVERAGE) + retMap.put("case_count", r.DEAL_TEST_CASE_NUM) + map.put(r.CITYNAME, retMap) + }); + return map + } + def getCityPPeIndex(def filePath){ + def datas = ExcelUtils.read(filePath,0,1) + def map = [:] + for(def d : datas){ + if(d['A']){ + map.put(d['A'], d['B'].toString().toDouble().toInteger()) + } + } + return map + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy index 792374cd7..5beecaf04 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 @@ -26,13 +26,15 @@ class ExportOracleData { // exportCommunityBuileType() // exportBigdataDistrictData() // exportBigdataCommunity() -// exportGuidedPrice() - exportBigdataForsale() + +// exportBigdataForsale("2021-10-19") +// exportGuidedPrice("2021-10-01","2021-11-01") + + // exportThirdPartyPrice() -// exportThirdPartyPrice2() + exportThirdPartyPrice2() // exportBigdataDeal() - // exportCommunityGuidedPrice() // exportAvmEvaluationGJNB() // exportAVMEvaluationItemGJNB() @@ -201,8 +203,8 @@ class ExportOracleData { } - def exportGuidedPrice() { - 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 "; + def exportGuidedPrice(def startDate, def endDate) { + 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 dealdate>=to_date('${startDate}','yyyy-MM-dd') and dealdate def data = [] @@ -429,7 +431,8 @@ class ExportOracleData { def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; def fileName = "/ccb/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" +// fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] //["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ­¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] @@ -494,15 +497,15 @@ class ExportOracleData { println "BIGDATA_COMMUNITY_GJ ÉÏ´«FtpÍê³É......" } - def exportBigdataForsale(){ + def exportBigdataForsale(publishDate){ //["±±¾©","ÉϺ£"] - def citys = ["ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","Î人","¹ãÖÝ"]//CcbCommonUtils.citys; + def citys = CcbCommonUtils.citys; def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; - def fileName = "/home/goojia/ccb/MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0002.dat" + def fileName = "/home/goojia/ccb/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}_0002.dat" + 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","Öн鹫˾Ãû³Æ","·¢²¼ÈË","·¢²¼È˵绰","ÃèÊöÐÅÏ¢","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","¸½¼ÓÐÅÏ¢"] for(def city : citys){ @@ -510,7 +513,7 @@ class ExportOracleData { 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}'"; + " 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')"; def allRows = [] def index = 0 sqlInstance.eachRow(sql,{r-> 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 351473f24..7a069e74c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -44,7 +44,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //Ìí¼Ó×Ô¼º¿âÖеÄÈ˹¤Ö¸µ¼¼Û - def prices = CcbCommonUtils.findPersonPrice(city, DateUtils.addMonth(new Date(), -6)) + def prices = CcbCommonUtils.findPersonPrice(city, "2021-10-1", "2021-11-1") if(prices){ def distMap = getDistrictMap(city) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index f9ac2e3fc..97725f68b 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 @@ -1,12 +1,15 @@ package com.fangjia.script.ccbevaluation import com.fangjia.core.RegionData +import com.fangjia.core.util.BaiDuApiUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.ccb.CcbCodeUtils import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.linxsh.util.AddressUtil import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.looplineinfo.Point +import com.fangjia.script.util.DateUtils import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils @@ -27,10 +30,14 @@ import java.util.regex.*; def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") +DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") + DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline") +def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; +def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) @@ -66,7 +73,7 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw -//def fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\»ù´¡Êý¾Ý½»¸¶Çé¿ö_0903.xlsx" +//def fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\»ù´¡Êý¾Ý½»¸¶Çé¿ö_0910.xlsx" //def datas = ExcelUtils.read("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ð¡Çø×Ö¶Î.xlsx",0,1) //def dealMap = [:] @@ -83,14 +90,14 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw // dealMap.put(d['A'], map) //} -def cityCodeDatas = CcbCommonUtils.findCityCodeValue() -//Ð¡ÇøÁ¿ +//def cityCodeDatas = CcbCommonUtils.findCityCodeValue() +////Ð¡ÇøÁ¿ //ExcelUtils.multiThreadingModify(fileName, { d -> // def city = d['B'] // if (city) { // def cityid = cityCodeDatas.get(city) // def total = findCount(cityid, sqlInstance) -// d['O'] = total +// d['H'] = total // } //},0) @@ -135,28 +142,238 @@ def cityCodeDatas = CcbCommonUtils.findCityCodeValue() // } //},1) -//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\8Ô³ɽ»Í³¼Æ.xlsx" -//def dealMap = findDealCount(sqlInstance) -//ExcelUtils.multiThreadingModify(fileName,{d-> +//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\ÉϺ£³É½».xlsx" +//def datas =ExcelUtils.read(fileName,0,1) +//def index = 0 +//def rows = [] +//for(def d : datas) { +//// def count = findDealDetail(sqlInstance, d['A'], d['B'], d['C'], d['P'], d['I'].toInteger(), d['K']) +// def count = findAvmData(sqlInstance, d['B'], d['C'], d['P'], d['I'].toInteger(), d['K']) +// if (count == 0) { +// index++ +// rows << d +// println index +" "+d +// } +//// if(rows.size()>20){ +//// break +//// } +//// def dists = CommonDatautils.findDistrictsByName(d['A'],d['C'],"district") +//// if(dists.size()==1){ +//// def dist = dists[0] +//// def count = youdaDeal(youda_esfhouse_coll, d['A'], dist.region, d['C'], d['P'], d['I'].toInteger(), d['K']) +//// if (count > 0) { +//// index++ +//// println index +" "+d +//// } +//// }else{ +//// for(def r :dists){ +//// if(d['B'].contains(r.region)){ +//// def count = youdaDeal(youda_esfhouse_coll, d['A'], r.region, d['C'], d['P'], d['I'].toInteger(), d['K']) +//// if (count > 0) { +//// index++ +//// println index +" "+d +//// } +//// } +//// } +//// } +//} +//ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\³É½»±¾´ÎδʹÓõļǼ.xlsx", rows, "Êý¾Ý") +//println "¹²²éµ½£º"+index + + +def findAvmData(sqlInstance, def region, def name, def area, def price, def dealdate){ + def sql = "select count(*) as count from avm_evaluation_item_gj where year_month=202106 and data_type='³É½»' and cityname='ÉϺ£' and distname='${region}' and commname='${name}' and buildarea=${area} and dealdate=to_date('${dealdate}','yyyy-MM-dd') and target_avg_price=${price}" + def count = 0 + sqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count +} + +def findDealDetail(def sqlInstance, def city, def region, def name, def area, def price, def dealdate){ + def sql = "select dealunitprice from bigdata_deal_gj where cityname='${city}' and distname='${region}' and commname='${name}' and buildarea= ${area} and dealdate=to_date('${dealdate}','yyyy-MM-dd')" + def count = 0 + sqlInstance.eachRow(sql,{r-> + if(r.dealunitprice == price){ + count++ + }else{ + println r.dealunitprice +" price:"+price + } + + }); + return count +} + + +def youdaDeal(youda_esfhouse_coll, def city, def region, def name, def area, def price, def dealdate){ + def date = DateUtils.parseFromTightByPattern(dealdate, "yyyy-MM-dd") + def q = new BasicDBObject() + q.put("contractTime", date); +// q.put("area", new BasicDBObject('$gte', 20)) + q.put("fjCity",city); + q.put("fjRegion",region); + q.put("fjName",name); + q.put("area",area); + q.put("price", price) + def count = youda_esfhouse_coll.count(q) + return count; +} + + +//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\½¨Ðгɽ»\\³É½»Êý¾Ý_1025 - ¸±±¾.xlsx" +//def dealMap = findDealCount(sqlInstance, "2021-06-01", "2021-07-01") +//def testMap = findCaluateCityPPE(sqlInstance, 202107) +//ExcelUtils.modify(fileName,{d-> +// if(d['C']){ +// def oldcount = dealMap.get(d['C']) +// d['F'] = oldcount +// def casecount = testMap.get(d['C']) +// d['G'] = casecount +// println d +// } +//},0) + +//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Ð¡Çø\\5¸ö³ÇÊÐÐ¡ÇøÁбí0723(1).xlsx",{d-> +// if(d['I'] && d['K']){ +// def dist = CommonDatautils.findDistrict("ÉϺ£",d['I'], d['K'], "district") +// if(dist){ +// d['S'] = dist._id.toString() +// } +// } +//},0) + +//0-Õý³£ 1-·ÇÐ¡Çø£¬2-µØ¿é£¬ 3-ÎÞÐ§Ð¡Çø£¬7-×ÔÈ»´å 9-¸ßµÂ±È¶ÔÍõÒ»ÆÚ²»´æÔÚɾ³ý +//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\ÐèÒªÐÞÕýµÄÒ»ÆÚÊý¾Ý.xlsx",{d-> // if(d['A']){ -// d['U'] = dealMap.get(d['A']) +// def obj = CommonDatautils.findDistrictById(d['A']) +// if(obj && obj.name.contains("Ò»ÆÚ")){ +// def newName = obj.name.toString().substring(0, obj.name.indexOf("Ò»ÆÚ")) +// if(newName){ +// def masterDist = CommonDatautils.findDistrict(obj.city, obj.region, newName, "district") +// if(masterDist && masterDist.name_cat==0){ +// def udata = new BasicDBObject() +// udata.put("name_cat", 9) +// udata.put("m_date",new Date()) +// +// def q = new BasicDBObject() +// q.put("_id", obj._id) +// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) +// }else{ +// d['D'] = "Ö÷Ãû²»´æÔÚ" +// } +// } +// } // } //},0) -def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\³É½»Î´Èë¿âÈ˹¤²¿·Ö³ÇÊÐͳ¼Æ.xlsx" -def datas = ExcelUtils.read(fileName, 0, 1) -def dealMap = [:] -for(def d : datas){ - dealMap.put(d['A'], d['B']) -} -ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\8Ô³ɽ»Í³¼Æ.xlsx",{d-> +def index = 0 +ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ð¡Çø\\ÐÂÔö±ðÃûÊý¾Ý_3788.xlsx",{d-> if(d['A']){ - d['W'] = dealMap.get(d['A']) + def dist = CommonDatautils.findDistrictById(d['A']) + if(dist){ + + def alias = [] + if(d['H'] && d['H']!=dist.name){ + alias << d['H'] + if(d['H'].contains("¡¤")){ + alias << d['H'].replace("¡¤", "") + } + if(dist.alias){ + for(def aliasName : dist.alias){ + if(!alias.contains(aliasName)){ + alias << aliasName + } + } + } + } + + def address = null + if(d['I']){ + address = AddressUtil.formatAddress(dist.city, d['I']) + } + + Long lng = null + Long lat = null + Long lat2 = null + Long lng2 = null + if(d['J']){ + lng = d['J'].toString().toDouble() * 10000000000l; + lat = d['K'].toString().toDouble() * 10000000000l; + def json = BaiDuApiUtils.geoconv(d['J'].toString().toDouble(), d['K'].toString().toDouble(), 3) + if(json != null && json.containsKey("x")) { + lat2 = json.get("y") * 10000000000l + lng2 = json.get("x") * 10000000000l + } + } + + def region = null + if(dist.region!=d['F']){ + region = dist.region + } + + def udata = new BasicDBObject() + if(region){ + udata.put("region", region) + } + + if(address){ + udata.put("address", address) + } + if(lat2){ + udata.put("lng", lng) + udata.put("lat", lat) + udata.put("lng2", lng2) + udata.put("lat2", lat2) + } + + if(alias){ + udata.put("alias", alias) + } + if(udata){ + index++ + DbUtils.seaweed.update(new BasicDBObject("_id", dist._id), new BasicDBObject('$set', udata)) + println index+ " "+dist.city +" "+dist.name+" "+udata + } + + } } + },0) + +//def fileName = "C:\\Users\\gaojuan\\Desktop\\·ÖÆÚ·ÖÇøÐ¡Çø.xlsx" +//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +//ExcelUtils.multiThreadingModify(fileName,{d-> +// def obj = CommonDatautils.findDistrictFieldById(d['C'],["alias"]) +// if(obj && obj.alias){ +// d['H'] = obj.alias.join(" ") +// } +//// def citycode = d['A'] +//// cityCodeDataMap.each {k,v-> +//// if(citycode.contains(v)){ +//// d['D'] = k +//// } +//// } +//},0) + + + + +//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\³É½»Î´Èë¿âÈ˹¤²¿·Ö³ÇÊÐͳ¼Æ.xlsx" +//def datas = ExcelUtils.read(fileName, 0, 1) +//def dealMap = [:] +//for(def d : datas){ +// dealMap.put(d['A'], d['B']) +//} +//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\8Ô³ɽ»Í³¼Æ.xlsx",{d-> +// if(d['A']){ +// d['W'] = dealMap.get(d['A']) +// } +//},0) + + //def fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\¾­Î³¶È´íÎóÊý¾ÝÐÞÕý.xlsx" //def updateIndex = 0 //def deleteIndex = 0 @@ -189,8 +406,8 @@ ExcelUtils.multiThreadingModify("D:\\ //},0) -def findDealCount(sqlInstance){ - def sql = "select cityname,count(*) as count from bigdata_deal_gj where dealdate>=to_date('2021-08-01','yyyy-mm-dd') and dealdate + map.put(r.CITYNAME, r.DEAL_TEST_CASE_NUM) + }); + return map +} + + def findEstateType(cityid, sqlInstance){ @@ -363,6 +590,67 @@ def getStreetInfo(def city, def glocation){ } +//def oracleDates = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\oracle³ÇÊÐͳ¼Æ.xlsx",0,1) +//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +//def oracleMap = [:] +//for(def d : oracleDates){ +// oracleMap.put(d['A'], d['B']) +//} +// +//def chDates = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\clickhouse.xlsx",0,1) +//def chMap = [:] +//for(def h : chDates){ +// chMap.put(h['A'].toString().replace(".0",""), h['B']) +//} + +//def citys = CcbCommonUtils.citys; +//def map = [:] +//def rets = [] +//for(def c : citys){ +// def citycode = cityCodeDataMap.get(c) +// rets << [c, chMap.get(citycode), oracleMap.get(citycode)] +//} +//ExcelUtils.write("C:\\Users\\gaojuan\\Desktop\\е¼·¿Ô´±È¶Ô.xlsx", rets, "ͳ¼Æ") + +//def weekend = DateUtils.getFirstDayOfWeek(new Date()) +//def districts = CommonDatautils.findAllDistrictByCity("ÉϺ£", "district", ["_id","city", "region", "name", "lng", "lat"]); +//def statMap = getDistrictStatByCity(DIST_SELL_STAT,"ÉϺ£", weekend) +//def rets = [] +// +//for(def dist : districts){ +// def row = [] +// row << dist.get("_id").toString() +// row << dist.city +// row << dist.region +// row << dist.name +// if(dist.lng){ +// row << dist.lng/10000000000.0 +// row << dist.lat/10000000000.0 +// }else{ +// row << "" +// row << "" +// } +// +// row << statMap.get(dist.region +"##"+dist.name) +// rets << row +//} +//ExcelUtils.write("C:\\Users\\gaojuan\\Desktop\\ÉϺ£Ð¡Çø.xlsx", rets, "Êý¾Ý") + + + + +def getDistrictStatByCity(DIST_SELL_STAT, city, weekend){ + def q = new BasicDBObject() + q.put("city", city) + q.put("weekend", weekend) + def dbcursor = DIST_SELL_STAT.find(q) + def map = new ConcurrentHashMap() + for(def d : dbcursor){ + map.put(d.region+"##"+d.district_name, d.avg_price) + } + return map +} + 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 b813a155d..ee52c745c 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 @@ -10,6 +10,8 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import groovy.sql.Sql +import org.bson.types.ObjectId import java.util.concurrent.ConcurrentHashMap @@ -28,6 +30,12 @@ class ThirdPartyPriceBatch extends BaseBatch { static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") + def sourceMap = ["Öî¸ðÕÒ·¿":"01", "°²¾Ó¿Í":"02","·¿ÌìÏÂ":"03","Á´¼Ò":"04","³ÇÊмҾÓ":"05","ÂóÌï":"06","±´¿Ç":"07","ÌÔ·¿365":"08","ÖÐÔ­":"09","Íò©Ê¿":"10","Q·¿":"11","·¿Ì½":"12", + "·¿¶à¶à":"13","ÎÒ°®ÎÒ¼Ò":"14","ìûÌ©Êý¾Ý":"15","¼ªÎÝÍø":"16","ÀÖ¾Ó":"17","21ÊÀ¼Í":"18","·¿²ú³¬ÊÐ":"19","58ͬ³Ç":"20"] + + def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + static main(args) { runBatch(new ThirdPartyPriceBatch(), args); } @@ -40,25 +48,27 @@ class ThirdPartyPriceBatch extends BaseBatch { def weekend = DateUtils.getFirstDayOfWeek(new Date()) for(def city : citys){ index++ - def statMap = getDistrictStatByCity(city, weekend) +// 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"]) +// def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) +// +// def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name","name_cat", "estate_type2","lng"]) def thirdPriceMap = findThirdPartyPrice(city, statMap) - def rets = createCityDatas(cityCodeDatas, distCodeMap, dists, thirdPriceMap) +// def rets = createCityDatas(cityCodeDatas, distCodeMap, dists, thirdPriceMap) +// def rets = createCityDatas2(cityCodeDatas, distCodeMap, dists, thirdPriceMap) +// rows.addAll(rets) + def rets = createData3(cityCodeDatas.get(city)) rows.addAll(rets) - println index+" "+city+" "+rets.size() + + println index+" "+city+" "+rets.size() +" "+rows.size() } - - def fileName = "/home/goojia/ccb/THIRD_PARTY_PRICE_GJ.dat" if(CommonDatautils.isWindow()){ fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\THIRD_PARTY_PRICE_GJ.dat" } - def header = ["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ­¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + def header = []//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ­¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false); } @@ -173,6 +183,203 @@ class ThirdPartyPriceBatch extends BaseBatch { } + def createCityDatas2(cityCodeDatas, distCodeMap, dists, thirdPriceMap) { + def rets = [] + for (def d : dists) { + + def third = thirdPriceMap.get(d.region + "##" + d.name) + if (third) { + def data = distCodeMap.get(d.region) + if (data) { + third.each{k,v-> + def ret = [] + ret << new ObjectId().toString() + ret << cityCodeDatas.get(d.city) + ret << data.district_code + ret << d._id.toString() + ret << d.name + def web = "" + if(k=="zhugezhaofang_esf_price"){ + web = "Öî¸ðÕÒ·¿" + }else if(k=="anjuke_esf_price"){ + web = "°²¾Ó¿Í" + }else if(k=="soufang_esf_price"){ + web = "·¿ÌìÏÂ" + }else if(k=="lianjia_esf_price"){ + web = "Á´¼Ò" + }else if(k=="cityhouse_esf_price"){ + web = "³ÇÊз¿²ú" + }else if(k=="maitian_esf_price"){ + web = "ÂóÌï" + }else if(k=="beike_esf_price"){ + web = "±´¿Ç" + }else if(k=="365house_esf_price"){ + web = "ÌÔ·¿365" + }else if(k=="zhongyuan_esf_price"){ + web = "ÖÐÔ­" + }else if(k=="tuboshi_esf_price"){ + web = "Íò©Ê¿" + }else if(k=="qfang_esf_price"){ + ret << "Q·¿" + }else if(k=="fangtan_esf_price"){ + ret << "·¿Ì½" + }else if(k=="fangduoduo_esf_price"){ + ret << "·¿¶à¶à" + }else if(k=="5i5j_esf_price"){ + ret << "ÎÒ°®ÎÒ¼Ò" + }else{ + ret << "" + } + + ret << sourceMap.get(web) + ret << web + ret << sDate + ret << v + + ret << DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd HH:mm:ss") + ret << "FJW" + rets << ret + } + } + } + } + return rets; + } + + def createData3(cityid){ + def sql = "select 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, TAOFANG_AVG_PRICE, ZHONGYUAN_AVG_PRICE, TBS_AVG_PRICE, QFANG_AVG_PRICE, FANGTAN_AVG_PRICE, FANGDUODUO_AVG_PRICE, WIWJ_AVG_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from THIRD_PARTY_PRICE_GJ where CITYID='${cityid}' and YEAR_MONTH=${sDate}"; + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def dataMap = [:] + + dataMap.COMMID = r.COMMID + dataMap.COMMNAME = r.COMMNAME + dataMap.CITYID = r.CITYID + dataMap.CITYNAME = r.CITYNAME + dataMap.DISTID = r.DISTID + dataMap.DISTNAME = r.DISTNAME + dataMap.YEAR_MONTH = r.YEAR_MONTH + def price_map = [:] + dataMap.price_map = price_map + if(r.ZHUGE_AVG_PRICE){ + price_map.zhuge_avg_price = r.ZHUGE_AVG_PRICE + } + + if(r.ANJUKE_AVG_PRICE){ + price_map.anjuke_avg_price = r.ANJUKE_AVG_PRICE + } + + if(r.FANG_AVG_PRICE){ + price_map.fang_avg_price = r.FANG_AVG_PRICE + } + + if(r.LIANJIA_AVG_PRICE){ + price_map.lianjia_avg_price = r.LIANJIA_AVG_PRICE + } + + if(r.CITYHOUSE_AVG_PRICE){ + price_map.cityhouse_avg_price = r.CITYHOUSE_AVG_PRICE + } + + if(r.MAITIAN_AVG_PRICE){ + price_map.maitian_avg_price = r.MAITIAN_AVG_PRICE + } + + if(r.KE_AVG_PRICE){ + price_map.ke_avg_price = r.KE_AVG_PRICE + } + + if(r.TAOFANG_AVG_PRICE){ + price_map.taofang_avg_price = r.TAOFANG_AVG_PRICE + } + + if(r.ZHONGYUAN_AVG_PRICE){ + price_map.zhongyuan_avg_price = r.ZHONGYUAN_AVG_PRICE + } + + if(r.TBS_AVG_PRICE){ + price_map.tbs_avg_price = r.TBS_AVG_PRICE + } + + if(r.QFANG_AVG_PRICE){ + price_map.qfang_avg_price = r.QFANG_AVG_PRICE + } + + if(r.FANGTAN_AVG_PRICE){ + price_map.fangtan_avg_price = r.FANGTAN_AVG_PRICE + } + + if(r.FANGDUODUO_AVG_PRICE){ + price_map.fangduoduo_avg_price = r.FANGDUODUO_AVG_PRICE + } + + if(r.WIWJ_AVG_PRICE){ + price_map.wiwj_avg_price = r.WIWJ_AVG_PRICE + } + dataMap.updatetime = r.UPDATETIME + + allRows << dataMap + }); + + + def results = [] + for(def m : allRows){ + def priceMap = m.price_map + priceMap.each{k,v-> + def ret = [] + ret << new ObjectId().toString() + ret << m.CITYID + ret << m.DISTID + ret << m.COMMID + ret << m.COMMNAME + + def web = "" + if(k=="zhuge_avg_price"){ + web = "Öî¸ðÕÒ·¿" + }else if(k=="anjuke_avg_price"){ + web = "°²¾Ó¿Í" + }else if(k=="fang_avg_price"){ + web = "·¿ÌìÏÂ" + }else if(k=="lianjia_avg_price"){ + web = "Á´¼Ò" + }else if(k=="cityhouse_avg_price"){ + web = "³ÇÊз¿²ú" + }else if(k=="maitian_avg_price"){ + web = "ÂóÌï" + }else if(k=="ke_avg_price"){ + web = "±´¿Ç" + }else if(k=="taofang_avg_price"){ + web = "ÌÔ·¿365" + }else if(k=="zhongyuan_avg_price"){ + web = "ÖÐÔ­" + }else if(k=="tbs_avg_price"){ + web = "Íò©Ê¿" + }else if(k=="qfang_avg_price"){ + web = "Q·¿" + }else if(k=="fangtan_avg_price"){ + web = "·¿Ì½" + }else if(k=="fangduoduo_avg_price"){ + web = "·¿¶à¶à" + }else if(k=="wiwj_avg_price"){ + web = "ÎÒ°®ÎÒ¼Ò" + } + + ret << sourceMap.get(web) + ret << web + ret << m.YEAR_MONTH + ret << v + ret << "" + ret << "" + ret << m.updatetime + results << ret + } + } + + return results + + } + + def findThirdPartyPrice(def city, def statMap){ def q = new BasicDBObject() q.put("city", city) 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 a35a99a4e..f7fb84bc2 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 @@ -39,26 +39,46 @@ class TradeStatLog { static main(args) { def task = new TradeStatLog() -// task.run() + task.run()//ͳ¼Æ×î½ü3¸öÔÂץȡµÄ³É½»Êý¾ÝÁ¿ // task.thirdPartyStat() // println Calendar.getInstance().get(Calendar.YEAR) // task.averageStat() - task.exportTrade() +// task.exportTrade() // task.deleteDistrict() +// task.deleteDealData() +// task.statTableCount() } + def statTableCount(){ + def sql = "SELECT * FROM all_tables WHERE OWNER = 'GOOJIA' and table_name not like '%FJW%' ORDER BY table_name" + def rets = [] + rets << ["±í","¿âÖÐ×ܼǼÊý","datÎļþ×ÜÊý"] + def tables = [] + sqlInstance.eachRow(sql,{r-> + tables << r.TABLE_NAME + }) + + for(def tn : tables){ + def s1 = "select count(*) as count from "+tn + sqlInstance.eachRow(s1,{r-> + rets << [tn, r.count, ""] + }) + } + ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\Êý¾ÝÁ¿Í³¼Æ1.xlsx", rets,"×ÜÁ¿Í³¼Æ") + } + def run(){ def citys = CcbCommonUtils.citys; def rets = [] - rets << ["³ÇÊÐ","6ÔÂ×ÜÁ¿","7ÔÂ×ÜÁ¿","8ÔÂ×ÜÁ¿","±´¿Ç","Á´¼Ò", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ­"] + rets << ["³ÇÊÐ","8ÔÂ×ÜÁ¿","9ÔÂ×ÜÁ¿","10ÔÂ×ÜÁ¿","Õ¼±È","±´¿Ç","Á´¼Ò", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ­"] def sources = ["±´¿ÇÕÒ·¿","Á´¼ÒÔÚÏß", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ­µØ²ú"] //def startDate = "2021-05-01" - def startDate = "2021-06-01" - def date = "2021-07-01" - def endDate = "2021-08-01" - def newDate = "2021-09-01" + def startDate = "2021-08-01" + def date = "2021-09-01" + def endDate = "2021-10-01" + def newDate = "2021-11-01" for(def city : citys){ def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) @@ -108,7 +128,7 @@ class TradeStatLog { } - ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\8Ô³ɽ»Í³¼Æ.xlsx", rets, "Êý¾Ý") + ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\10Ô³ɽ»Í³¼Æ.xlsx", rets, "Êý¾Ý") println "±í¸ñÉú³ÉÍê³É" } @@ -460,7 +480,7 @@ class TradeStatLog { rets << headers for(def city : citys){ - def trades = findTradesDetail(city, DateUtils.parseFromTightByPattern("2021-07-01","yyyy-MM-dd"), DateUtils.parseFromTightByPattern("2021-08-01","yyyy-MM-dd")) + def trades = findTradesDetail(city, DateUtils.parseFromTightByPattern("2021-09-01","yyyy-MM-dd"), DateUtils.parseFromTightByPattern("2021-10-01","yyyy-MM-dd")) // def trades = getYouDaData() //def statMap = getDistrictStatByCity(city, weekend) @@ -479,6 +499,9 @@ class TradeStatLog { if(!distId && (t.district_name.toString().endsWith("Ū") || t.district_name.toString().endsWith("ºÅ"))){ distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name+"Ð¡Çø") } + if(!distId && t.district_name.toString().endsWith("Ð¡Çø")){ + distId = nameMap.get(t.city +"##"+t.region+"##"+t.district_name.replace("Ð¡Çø","")) + } if(!distId){ def flag = t.district_name.matches('^[\u4e00-\u9fa5]+?(·|´óµÀ|½Ö).+[ŪºÅ]$') if(flag){ @@ -510,6 +533,9 @@ class TradeStatLog { // if(t.avg_priceendPrice){ // reason = "¼Û¸ñ¹ýÂË" // } + if(!dist.name_cat && dist.name_cat!=0){ + reason = "ÎÞname_cat" + } if(dist.name_cat != 0 || !dist.lng || !["ÆÕͨסլ","ÉÌס"].contains(dist.estate_type2) || dist.name.contains("Ñó·¿") || dist.name.contains("¹«·¿")){ reason = "Ð¡Çø¹ýÂË" } @@ -531,7 +557,7 @@ class TradeStatLog { println city +" "+rets.size() } - ExcelUtils.write("d:\\Êý¾Ý\\³É½»Î´Èë¿â¼Ç¼(7ÔÂÈ«).xlsx", rets,"Êý¾Ý") + ExcelUtils.write("d:\\Êý¾Ý\\³É½»Î´Èë¿â¼Ç¼(9ÔÂ).xlsx", rets,"Êý¾Ý") } def deleteDistrict(){ @@ -588,7 +614,7 @@ class TradeStatLog { } def findDealIds(city){ - def sql = "select * from bigdata_deal_gj where dealdate>=to_date('2021-07-01','yyyy-mm-dd') and dealdate @@ -649,4 +675,22 @@ class TradeStatLog { return map } + def deleteDealData(){ + def commIds = [] + sqlInstance.eachRow("select commid from bigdata_community_gj",{r-> + commIds << r.commid + }) + + def sql = "select commid from bigdata_deal_gj" + def delIds = [] + sqlInstance.eachRow(sql,{r-> + if(!commIds.contains(r.commid)){ + if(!delIds.contains(r.commid)){ + println "²»´æÔÚ£º"+ r.commid + sqlInstance.executeUpdate("delete from bigdata_deal_gj where commid=${r.commid}") + } + } + }) + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy index cb189d420..74164d43e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateHouseRegion.groovy @@ -206,8 +206,8 @@ class UpdateHouseRegion { } def updateNoMatchDealRegion(){ - ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\³É½»Î´Èë¿â¼Ç¼(7ÔÂÈ«).xlsx",{d-> - if(!d['J']){ + ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\½¨Ðгɽ»\\³É½»Î´Èë¿â¼Ç¼_9Ô - 10.25ÇøÓò´íÎó.xlsx",{d-> + if(d['K'] && d['K']=='ÇøÓò´íÎó'){ def city = d['B'] def region = d['C'] def name = d['D'] @@ -222,7 +222,7 @@ class UpdateHouseRegion { def udata = new BasicDBObject() udata.put("region", dist.region) DEAL_PRICE_COLL.update(new BasicDBObject('_id', new ObjectId(d['A'])), new BasicDBObject('$set', udata)) - d['J'] = "Ô­Êý¾ÝÇøÓòÐ޸ģ¨"+dist.region+"£©" + d['M'] = "Ô­Êý¾ÝÇøÓòÐ޸ģ¨"+dist.region+"£©" println d['A']+" "+region +" "+dist.region } } 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 12bbc9acc..a36bdf5f7 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 @@ -43,16 +43,33 @@ class BigdataCommunityGJRHBatch extends BaseBatch { @Override public void process(Object args) { - //"ÏÃÃÅ","±±¾©","ÉϺ£", - def citys = ["¹ãÖÝ","ÉîÛÚ","ÖØÇì","Ö£ÖÝ","³¤É³","Î÷°²","³É¶¼","¶«Ý¸","·ðɽ","º¼ÖÝ","ºÏ·Ê","ÄϾ©","Çൺ","ÉòÑô","ËÕÖÝ","Ìì½ò","Î人"]//CcbCommonUtils.citys; + def citys = ["´óÁ¬","¹þ¶û±õ","ºôºÍºÆÌØ","ÏÃÃÅ"]//CcbCommonUtils.citys; def rows = [] - -// addBigdataDistrictFJW() def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +// for (def city : citys) { +// def cityid = cityCodeDataMap.get(city) +// def sql ="select count(*) as count from BIGDATA_COMMUNITY_FJW where CITYID='${cityid}'" +// sqlInstance.eachRow(sql, { r -> +// println city +" "+r.count +// }) +// } + +//// addBigdataDistrictFJW() + + for (def city : citys) { 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", ["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"]) + def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"]) 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"]) @@ -81,54 +98,109 @@ class BigdataCommunityGJRHBatch extends BaseBatch { addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city)) println city +" 4.Ð¡Çø½¨ÖþÄê´ú±í" addBigdataCommfeeGj(districts, cityCodeDataMap.get(city)) - println city +" 6.Ð¡Çø·ÑÓñí" + println city +" 5.Ð¡Çø·ÑÓñí" addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city)) - println city +" 7.Ð¡Çø·¿ÎÝÓÃ;±í" + println city +" 6.Ð¡Çø·¿ÎÝÓÃ;±í" addBigdataPositionGJ(districts, cityCodeDataMap.get(city)) - println city + " 8.µØÀíλÖñí" + println city + " 7.µØÀíλÖñí" + +// addDealFieldInfo(distMap, cityCodeDataMap.get(city)); } } def addBigdataCommunityGJRH(def districts, def cityid){ - sqlInstance.executeUpdate("delete from BIGDATA_COMMUNITY_FJW where CITYID='${cityid}'") - sqlInstance.withBatch(batchsize) { stmt -> - for(def d : districts){ - def sql = "INSERT INTO BIGDATA_COMMUNITY_FJW (CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,CREATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.distid}','${d.commid}','${d.commname}',${converValue(d.address)},${d.landarea},${d.buildarea},${d.greeningrate},${d.plotratio},${d.parkingcnt}," - if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.commtype}','${d.commalias}'," - }else{ - sql = sql + "null,'${d.commtype}','${d.commalias}'," - } - if(d.street && d.street!='null'){ - sql = sql +"'${d.street}'," - }else{ - sql = sql +"null," - } - if(d.streetno && d.streetno!='null'){ - sql = sql + "'${d.streetno}'," - }else{ - sql = sql +"null," - } - - sql = sql + "'${d.ifnew}',null,${d.remark}," - if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" - }else{ - sql = sql + "null,'${d.sourcecode}')" - } - - try{ - stmt.addBatch sql - }catch(Exception e){ - println d - println sql - } +// sqlInstance.executeUpdate("delete from BIGDATA_COMMUNITY_FJW where CITYID='${cityid}'") + def rets = [] + for(def d : districts){ + def ret = [] + ret << d.cityid + ret << d.distid + ret << d.commid + ret << d.commname + ret << converValue2(d.address) + ret << d.landarea + ret << d.buildarea + ret << d.greeningrate + ret << d.plotratio + ret << d.parkingcnt + if(d.updatetime){ + ret << d.updatetime//DateUtils.formatDateByPattern(d.updatetime, "yyyy-MM-dd HH:mm:ss") + }else{ + ret << "" } - + ret << d.commtype + ret << d.commalias + if(d.street && d.street!='null'){ + ret << d.street + }else{ + ret << "" + } + if(d.streetno && d.streetno!='null'){ + ret << d.streetno + }else{ + ret << "" + } + ret << d.ifnew + ret << "" + ret << d.remark + if(d.createtime){ + ret << d.createtime//DateUtils.formatDateByPattern(d.createtime, "yyyy-MM-dd HH:mm:ss") + }else{ + ret << "" + } + ret << d.sourcecode + rets << ret } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMUNITY_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_FJW.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......" + + +// sqlInstance.withBatch(batchsize) { stmt -> +// for(def d : districts){ +// def sql = "INSERT INTO BIGDATA_COMMUNITY_FJW (CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,CREATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.distid}','${d.commid}','${d.commname}',${converValue(d.address)},${d.landarea},${d.buildarea},${d.greeningrate},${d.plotratio},${d.parkingcnt}," +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.commtype}','${d.commalias}'," +// }else{ +// sql = sql + "null,'${d.commtype}','${d.commalias}'," +// } +// if(d.street && d.street!='null'){ +// sql = sql +"'${d.street}'," +// }else{ +// sql = sql +"null," +// } +// if(d.streetno && d.streetno!='null'){ +// sql = sql + "'${d.streetno}'," +// }else{ +// sql = sql +"null," +// } +// +// sql = sql + "'${d.ifnew}',null,${d.remark}," +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// +// try{ +// stmt.addBatch sql +// }catch(Exception e){ +// println d +// println sql +// } +// +// } +// +// } } def converValue(def val){ @@ -139,222 +211,426 @@ class BigdataCommunityGJRHBatch extends BaseBatch { } } - def addBigdataCommbuildstruGJ(def districts, def cityid){ - sqlInstance.executeUpdate("delete from BIGDATA_COMMBUILDSTRU_FJW where CITYID='${cityid}'") - sqlInstance.withBatch(batchsize) { stmt -> - for(def d : districts){ - def sql = "INSERT INTO BIGDATA_COMMBUILDSTRU_FJW (CITYID,COMMID,BUILDSTRU,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.buildstru}',${d.remark}," - if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," - }else{ - sql = sql + "null," - } - if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" - }else{ - sql = sql + "null,'${d.sourcecode}')" - } - try{ - stmt.addBatch sql - }catch(Exception e){ - println d - println sql - } - } + def converValue2(def val){ + if(val && val!='null'){ + return val; + }else{ + return null } } + def addBigdataCommbuildstruGJ(def districts, def cityid){ + + def rets = [] + for(def d : districts) { + def ret = [] + ret << d.cityid + ret << d.commid + ret << d.buildstru + ret << d.remark + if(d.createtime){ + ret << d.createtime + }else{ + ret << "" + } + if(d.updatetime){ + ret << d.updatetime + }else{ + ret << "" + } + ret << d.sourcecode + rets << ret + + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMBUILDSTRU_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDSTRU_FJW.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_COMMBUILDSTRU_FJW Êý¾ÝÎļþÊä³öÍê³É......" + + // sqlInstance.executeUpdate("delete from BIGDATA_COMMBUILDSTRU_FJW where CITYID='${cityid}'") +// sqlInstance.withBatch(batchsize) { stmt -> +// for(def d : districts){ +// def sql = "INSERT INTO BIGDATA_COMMBUILDSTRU_FJW (CITYID,COMMID,BUILDSTRU,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.buildstru}',${d.remark}," +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," +// }else{ +// sql = sql + "null," +// } +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// try{ +// stmt.addBatch sql +// }catch(Exception e){ +// println d +// println sql +// } +// } +// } + } + def addBigdataCommhousetypeGJ(def districts, def cityid){ - sqlInstance.executeUpdate("delete from BIGDATA_COMMHOUSETYPE_FJW where CITYID='${cityid}'") - sqlInstance.withBatch(batchsize) { stmt -> - for(def d : districts){ - def sql = "INSERT INTO BIGDATA_COMMHOUSETYPE_FJW (CITYID,COMMID,HOUSETYPE,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.housetype}',${d.remark}," - if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," - }else{ - sql = sql + "null," - } - if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" - }else{ - sql = sql + "null,'${d.sourcecode}')" - } - try{ - stmt.addBatch sql - }catch(Exception e){ - println d - println sql - } + + def rets = [] + for(def d : districts) { + def ret = [] + ret << d.cityid + ret << d.commid + ret << d.housetype + ret << d.remark + if(d.createtime){ + ret << d.createtime + }else{ + ret << "" } + if(d.updatetime){ + ret << d.updatetime + }else{ + ret << "" + } + ret << d.sourcecode + rets << ret + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMHOUSETYPE_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMHOUSETYPE_FJW.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_COMMHOUSETYPE_FJW Êý¾ÝÎļþÊä³öÍê³É......" + + +// sqlInstance.executeUpdate("delete from BIGDATA_COMMHOUSETYPE_FJW where CITYID='${cityid}'") +// +// sqlInstance.withBatch(batchsize) { stmt -> +// for(def d : districts){ +// def sql = "INSERT INTO BIGDATA_COMMHOUSETYPE_FJW (CITYID,COMMID,HOUSETYPE,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.housetype}',${d.remark}," +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," +// }else{ +// sql = sql + "null," +// } +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// try{ +// stmt.addBatch sql +// }catch(Exception e){ +// println d +// println sql +// } +// } +// } } def addBigdataCommbuildyearGj(districts, def cityid){ - sqlInstance.executeUpdate("delete from BIGDATA_COMMBUILDYEAR_FJW where CITYID='${cityid}'") - - sqlInstance.withBatch(batchsize) { stmt -> - for(def d : districts){ - if(d.buildyear){ - def sql = "INSERT INTO BIGDATA_COMMBUILDYEAR_FJW (CITYID,COMMID,BUILDYEAR,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}',${d.buildyear},${d.remark}," - if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," - }else{ - sql = sql + "null," - } - if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" - }else{ - sql = sql + "null,'${d.sourcecode}')" - } - try{ - stmt.addBatch sql - }catch(Exception e){ - println d - println sql - } - } + def rets = [] + for(def d : districts) { + def ret = [] + ret << d.cityid + ret << d.commid + ret << d.buildyear + ret << d.remark + if(d.createtime){ + ret << d.createtime + }else{ + ret << "" } + if(d.updatetime){ + ret << d.updatetime + }else{ + ret << "" + } + ret << d.sourcecode + rets << ret + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMBUILDYEAR_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDYEAR_FJW.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_COMMBUILDYEAR_FJW Êý¾ÝÎļþÊä³öÍê³É......" + +// sqlInstance.executeUpdate("delete from BIGDATA_COMMBUILDYEAR_FJW where CITYID='${cityid}'") +// +// sqlInstance.withBatch(batchsize) { stmt -> +// for(def d : districts){ +// if(d.buildyear){ +// def sql = "INSERT INTO BIGDATA_COMMBUILDYEAR_FJW (CITYID,COMMID,BUILDYEAR,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}',${d.buildyear},${d.remark}," +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," +// }else{ +// sql = sql + "null," +// } +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// try{ +// stmt.addBatch sql +// }catch(Exception e){ +// println d +// println sql +// } +// } +// } +// } } def addBigdataCommfeeGj(districts, def cityid){ - - sqlInstance.executeUpdate("delete from BIGDATA_COMMFEE_FJW where CITYID='${cityid}'") - - def sqls = [] - for(def d : districts){ - if(d.estatecharge){ - def sql = "INSERT INTO BIGDATA_COMMFEE_FJW (CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.compid}',${d.estatecharge},'${d.houseuse}','${d.buildtype}','1',${d.note},${d.remark}," - if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," - }else{ - sql = sql + "null," - } - if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" - }else{ - sql = sql + "null,'${d.sourcecode}')" - } - sqls << sql - - if (sqls.size() >= batchsize) { - try { - sqlInstance.withBatch(batchsize, { stmt -> - sqls.each { def s -> - stmt.addBatch s - } - }) - - } catch (Exception e) { - println sqls[0] - e.printStackTrace() - } - sqls.clear() - } - + def rets = [] + for(def d : districts) { + def ret = [] + ret << d.cityid + ret << d.commid + ret << d.compid + ret << d.estatecharge + ret << d.houseuse + ret << d.buildtype + ret << '1' + ret << d.note + ret << d.remark + if(d.createtime){ + ret << d.createtime + }else{ + ret << "" } - } + if(d.updatetime){ + ret << d.updatetime + }else{ + ret << "" + } + ret << d.sourcecode + rets << ret - if (sqls.size() > 0) { - sqlInstance.withBatch(100, { stmt -> - sqls.each { def s -> - stmt.addBatch s - } - }) } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMFEE_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMFEE_FJW.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_COMMFEE_FJW Êý¾ÝÎļþÊä³öÍê³É......" + + +// sqlInstance.executeUpdate("delete from BIGDATA_COMMFEE_FJW where CITYID='${cityid}'") +// +// def sqls = [] +// for(def d : districts){ +// if(d.estatecharge){ +// def sql = "INSERT INTO BIGDATA_COMMFEE_FJW (CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.compid}',${d.estatecharge},'${d.houseuse}','${d.buildtype}','1',${d.note},${d.remark}," +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," +// }else{ +// sql = sql + "null," +// } +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// sqls << sql +// +// if (sqls.size() >= batchsize) { +// try { +// sqlInstance.withBatch(batchsize, { stmt -> +// sqls.each { def s -> +// stmt.addBatch s +// } +// }) +// +// } catch (Exception e) { +// println sqls[0] +// e.printStackTrace() +// } +// sqls.clear() +// } +// +// } +// } +// +// if (sqls.size() > 0) { +// sqlInstance.withBatch(100, { stmt -> +// sqls.each { def s -> +// stmt.addBatch s +// } +// }) +// } } def addBigdataCommhouseuseGJ(districts, def cityid){ - sqlInstance.executeUpdate("delete from BIGDATA_COMMHOUSEUSE_FJW where CITYID='${cityid}'") - - def sqls = [] - for(def d : districts){ - def sql = "INSERT INTO BIGDATA_COMMHOUSEUSE_FJW (CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.houseuse}',${d.zts},${d.remark}," - if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," - }else{ - sql = sql + "null," - } - if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" - }else{ - sql = sql + "null,'${d.sourcecode}')" - } - sqls << sql - - if (sqls.size() >= batchsize) { - try { - sqlInstance.withBatch(batchsize, { stmt -> - sqls.each { def s -> - stmt.addBatch s - } - }) - - } catch (Exception e) { - e.printStackTrace() - } - sqls.clear() - } + def rets = [] + for(def d : districts) { + def ret = [] + ret << d.cityid + ret << d.commid + ret << d.houseuse + ret << d.zts + ret << d.remark + if(d.createtime){ + ret << d.createtime + }else{ + ret << "" + } + if(d.updatetime){ + ret << d.updatetime + }else{ + ret << "" + } + ret << d.sourcecode + rets << ret } - - if (sqls.size() > 0) { - sqlInstance.withBatch(100, { stmt -> - sqls.each { def s -> - stmt.addBatch s - } - }) + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMHOUSEUSE_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMHOUSEUSE_FJW.dat" } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_COMMHOUSEUSE_FJW Êý¾ÝÎļþÊä³öÍê³É......" + +// sqlInstance.executeUpdate("delete from BIGDATA_COMMHOUSEUSE_FJW where CITYID='${cityid}'") +// +// def sqls = [] +// for(def d : districts){ +// def sql = "INSERT INTO BIGDATA_COMMHOUSEUSE_FJW (CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}', '${d.commid}','${d.houseuse}',${d.zts},${d.remark}," +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," +// }else{ +// sql = sql + "null," +// } +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// sqls << sql +// +// if (sqls.size() >= batchsize) { +// try { +// sqlInstance.withBatch(batchsize, { stmt -> +// sqls.each { def s -> +// stmt.addBatch s +// } +// }) +// +// } catch (Exception e) { +// e.printStackTrace() +// } +// sqls.clear() +// } +// +// } +// +// if (sqls.size() > 0) { +// sqlInstance.withBatch(100, { stmt -> +// sqls.each { def s -> +// stmt.addBatch s +// } +// }) +// } } def addBigdataPositionGJ(districts, def cityid){ - sqlInstance.executeUpdate("delete from BIGDATA_POSITION_FJW where CITYID='${cityid}'") - - def sqls = [] - def index = 1 - for(def d : districts){ - def sql = "INSERT INTO BIGDATA_POSITION_FJW (CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}','5', '${d.commid}','1',${index},${d.lng},${d.lat},null,${d.remark}," + def rets = [] + def index = 0 + for(def d : districts) { index++ + def ret = [] + ret << d.cityid + ret << "5" + ret << d.commid + ret << "1" + ret << index + ret << d.lng + ret << d.lat + ret << "" + ret << d.remark if(d.createtime){ - sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," + ret << d.createtime }else{ - sql = sql + "null," + ret << "" } if(d.updatetime){ - sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" + ret << d.updatetime }else{ - sql = sql + "null,'${d.sourcecode}')" + ret << "" } - sqls << sql - - if (sqls.size() >= batchsize) { - try { - sqlInstance.withBatch(batchsize, { stmt -> - sqls.each { def s -> - stmt.addBatch s - } - }) - - } catch (Exception e) { - e.printStackTrace() - } - sqls.clear() - } - + ret << d.sourcecode + rets << ret } - - if (sqls.size() > 0) { - sqlInstance.withBatch(100, { stmt -> - sqls.each { def s -> - stmt.addBatch s - } - }) + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_POSITION_FJW.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POSITION_FJW.dat" } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", true); + println "BIGDATA_POSITION_FJW Êý¾ÝÎļþÊä³öÍê³É......" + +// sqlInstance.executeUpdate("delete from BIGDATA_POSITION_FJW where CITYID='${cityid}'") +// +// def sqls = [] +// def index = 1 +// for(def d : districts){ +// def sql = "INSERT INTO BIGDATA_POSITION_FJW (CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,CREATETIME,UPDATETIME,SOURCECODE) VALUES ('${d.cityid}','5', '${d.commid}','1',${index},${d.lng},${d.lat},null,${d.remark}," +// index++ +// if(d.createtime){ +// sql = sql + "to_date('${d.createtime}','yyyy-mm-dd hh24:mi:ss')," +// }else{ +// sql = sql + "null," +// } +// if(d.updatetime){ +// sql = sql + "to_date('${d.updatetime}','yyyy-mm-dd hh24:mi:ss'),'${d.sourcecode}')" +// }else{ +// sql = sql + "null,'${d.sourcecode}')" +// } +// sqls << sql +// +// if (sqls.size() >= batchsize) { +// try { +// sqlInstance.withBatch(batchsize, { stmt -> +// sqls.each { def s -> +// stmt.addBatch s +// } +// }) +// +// } catch (Exception e) { +// e.printStackTrace() +// } +// sqls.clear() +// } +// +// } +// +// if (sqls.size() > 0) { +// sqlInstance.withBatch(100, { stmt -> +// sqls.each { def s -> +// stmt.addBatch s +// } +// }) +// } } def addBigdataDistrictFJW(){ @@ -372,4 +648,85 @@ class BigdataCommunityGJRHBatch extends BaseBatch { } } + def addDealFieldInfo(distMap, cityid){ + updateDealHouseStyle(distMap, cityid); + } + + def updateDealHouseStyle(distMap, cityid){ + def sql = "select dealid,housestyle,buildtype,roomcnt,livingroomcnt,buildyear,address,street,streetno,commid from bigdata_deal_gj_fjw where cityid='${cityid}'"; + try{ + def index = 0 + sqlInstance.eachRow(sql,{r-> + index++ +// println index +" "+r.housestyle+" "+r.buildtype+" "+r.roomcnt+" "+r.livingroomcnt + def housetype = null + if(r.buildtype && ["0112","0110","0109"].contains(r.buildtype)){ + housetype = "07" + }else if(r.buildtype && ["0107","0106","0105"].contains(r.buildtype)){ + housetype = "16" + }else{ + if(r.roomcnt && r.roomcnt==4){ + if(r.livingroomcnt>1){ + housetype = "14" + }else{ + housetype = "11" + } + }else if(r.roomcnt && r.roomcnt==3){ + if(r.livingroomcnt>1){ + housetype = "13" + }else{ + housetype = "10" + } + }else if(r.roomcnt && r.roomcnt==2){ + if(r.livingroomcnt>1){ + housetype = "12" + }else{ + housetype = "09" + } + }else if(r.roomcnt && r.roomcnt==1){ + housetype = "08" + }else{ + housetype="99" + } + } + + def dist = distMap.get(r.commid) + def address = "" + def buildyear = null + if(dist){ +// if(!r.address){ + if(r.street || r.streetno){ + address = r.street + if(r.streetno && r.streetno!="null"){ + address = address + r.streetno + } + }else if(r.street){ + address = dist.address + } +// } + if(!r.buildyear && dist.finish_building_date){ + buildyear = CcbCodeUtils.getBuildYear(dist.finish_building_date); + } + } + if(housetype || buildyear || address){ + def updateSql = "update bigdata_deal_gj_fjw set housestyle='${housetype}'" + if(buildyear){ + updateSql = updateSql + ",buildyear=${buildyear}" + } + if(address){ + updateSql = updateSql + ",address='${address}'" + } + updateSql = updateSql + " where dealid='${r.dealid}'" + + println index + " "+ updateSql + sqlInstance.withBatch(batchsize, { stmt -> + stmt.addBatch updateSql + }) + } + }); + }catch(Exception e){ + + } + } + } \ No newline at end of file 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 8dbfd559f..0c5d156d6 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 @@ -3,6 +3,8 @@ 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.CcbFtpUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.util.DateUtils @@ -22,52 +24,69 @@ class ExportDistrictRongHe extends BaseBatch{ @Override void process(Object args) { - exportBigdataCommunityGJRH() - exportBigdataCommbuildstruGJ() - exportBigdataCommhousetypeGJ() - exportBigdataCommbuildyearGj() - exportBigdataCommfeeGj() - exportBigdataCommhouseuseGJ() - exportBigdataPositionGJ() - exportBigdataDistrictFJW() + def citys = ["´óÁ¬","¹þ¶û±õ","ºôºÍºÆÌØ","ÏÃÃÅ"] + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + for(def city : citys) { + def cityCode = cityCodeDataMap.get(city) + exportBigdataCommbuildstruGJ(cityCode) + exportBigdataCommunityGJRH(cityCode) + exportBigdataCommhousetypeGJ(cityCode) + exportBigdataCommbuildyearGj(cityCode) + exportBigdataCommfeeGj(cityCode) + exportBigdataCommhouseuseGJ(cityCode) + exportBigdataPositionGJ(cityCode) + exportBigdataDistrictFJW(cityCode) + + exportBigdataDealFJW(cityCode) + exportBigdataBuildingFJW(cityCode) + } + + exportEvaluateRate() + } - def exportBigdataCommunityGJRH(){ - 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"; + 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.DISTID 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 << r.UPDATETIME - data << r.COMMTYPE - data << r.COMMALIAS - data << r.STREET - data << r.STREETNO - data << r.IFNEW data << r.INTRODUCTION data << r.REMARK data << r.CREATETIME + data << r.UPDATETIME data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMUNITY_FJW_${curDate}_0001.dat" + + + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_COMMUNITY_GJRH_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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"; + def exportBigdataCommbuildstruGJ(cityCode){ + 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 = [] @@ -80,16 +99,18 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_COMMBUILDSTRU_GJ_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......" } - def exportBigdataCommhousetypeGJ(){ - 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"; + 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 = [] @@ -102,16 +123,18 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_COMMHOUSETYPE_GJ_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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"; + def exportBigdataCommbuildyearGj(cityCode){ + 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 = [] @@ -124,16 +147,18 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_COMMBUILDYEAR_GJ_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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"; + def exportBigdataCommfeeGj(cityCode){ + 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 = [] @@ -151,17 +176,19 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMFEE_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_COMMFEE_GJ_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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"; + def exportBigdataCommhouseuseGJ(cityCode){ + 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 = [] @@ -175,16 +202,18 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_COMMHOUSEUSE_GJ_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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"; + def exportBigdataPositionGJ(cityCode){ + 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 = [] @@ -202,16 +231,18 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_POSITION_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_POSITION_GJ_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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"; + def exportBigdataDistrictFJW(cityCode){ + 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 = [] @@ -228,12 +259,162 @@ class ExportDistrictRongHe extends BaseBatch{ data << r.SOURCECODE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"18" - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DISTRICT_FJW_${curDate}_0001.dat" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\BIGDATA_DISTRICT_FJW_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + println "BIGDATA_DISTRICT_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataDealFJW(cityCode){ + 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 CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,WORKDATE from BIGDATA_DEAL_FJW where CITYID='${cityCode}'"; + 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.WORKDATE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......" + } + + + 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 + data << r.BUILDTYPE + 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}/${cityCode}/FJW_000000_${cityCode}_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${cityCode}\\FJW_000000_${cityCode}_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload(fileName, curDate+"/${cityCode}") + 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); + CcbFtpUtils.ftpUpload(fileName, curDate) + println "BIGDATA_DISTRICT_FJW ÉÏ´«FtpÍê³É......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/FenQiDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/FenQiDistrict.groovy new file mode 100644 index 000000000..39618d2af --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/FenQiDistrict.groovy @@ -0,0 +1,4 @@ +package com.fangjia.script.ccbevaluation.ronghe + +class FenQiDistrict { +} 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 a721e472b..88100888a 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 @@ -1,48 +1,100 @@ package com.fangjia.script.fuzhou import com.fangjia.core.util.GeocodeUtils +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 org.apache.commons.io.FileUtils import org.bson.types.ObjectId -List list = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\FJW_HOUSE_201911.csv")) -println "¹ýÂËǰ£º"+list.size()+ " "+new Date().toLocaleString() -def ret = [] -def map = [:] -for(def s : list){ - def row = s.split(",") - if(!map.containsKey(row[0])){ - map.put(row[0], s) - ret << s - }else{ - println row[0]+" ´æÔÚ" - } -} -println "¹ýÂ˺ó£º"+list.size()+ " "+new Date().toLocaleString() +//List list = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\FJW_HOUSE_201911.csv")) +//println "¹ýÂËǰ£º"+list.size()+ " "+new Date().toLocaleString() +//def ret = [] +//def map = [:] +//for(def s : list){ +// def row = s.split(",") +// if(!map.containsKey(row[0])){ +// map.put(row[0], s) +// ret << s +// }else{ +// println row[0]+" ´æÔÚ" +// } +//} +//println "¹ýÂ˺ó£º"+list.size()+ " "+new Date().toLocaleString() +// +//def getHouse(def id){ +// def must = [] +// def term1 = ["term":["_id":id]] +// +// must << term1 +// +// def params = ["query":["bool":["must":must]]] +// def s = EsUtils.httpSaveData(params, "http://192.168.0.206:9200/seawater-201*/_doc/_search"); +// def location = [:]; +// if(s){ +// def doc = new groovy.json.JsonSlurper().parseText(s) +// def hits = doc.hits +// if(hits){ +// hits = hits.hits +// } +// if(hits && hits.size()==1){ +// def source = hits[0].get("_source") +// location = source.location +// }else{ +// println "²éÕÒ¾­Î³¶ÈÓÐÎÊÌâ......"+hits.size() +// } +// } +// return location; +//} -def getHouse(def id){ - def must = [] - def term1 = ["term":["_id":id]] - - must << term1 - - def params = ["query":["bool":["must":must]]] - def s = EsUtils.httpSaveData(params, "http://192.168.0.206:9200/seawater-201*/_doc/_search"); - def location = [:]; - if(s){ - def doc = new groovy.json.JsonSlurper().parseText(s) - def hits = doc.hits - if(hits){ - hits = hits.hits - } - if(hits && hits.size()==1){ - def source = hits[0].get("_source") - location = source.location - }else{ - println "²éÕÒ¾­Î³¶ÈÓÐÎÊÌâ......"+hits.size() +//List list1= FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202109.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_202108.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:\\Êý¾Ý\\¸£ÖÝ\\¼Û¸ñ±È¶Ô.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){ + if(obj.value_type == 1){ + d["G"] = "Ö¸µ¼¼Û" + }else if(obj.value_type == 2){ + d["G"] ="×ÔÉíÑù±¾" + }else if(obj.value_type == 3){ + d["G"] = "µÚÈý·½" + }else if(obj.value_type == 4){ + d["G"] = "½»Ò×Êý¾Ý" + }else if(obj.value_type == 5){ + d["G"] ="ÖܱßÂ¥ÅÌ" + }else if(obj.value_type == 6){ + d["G"] ="ÍÆµ¼" + }else if(obj.value_type == 9){ + d["G"] = "Éñ¾­ÍøÂç" + }else if(obj.value_type == 10){ + d["G"] = "ÎÞ·½Ê½" } } - return location; -} +},0) + + + 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 ad5a8babc..9052add7e 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_202109.csv") +def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202110.csv") def count0 = 0 def count1 = 0 def count2 = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy index bbb18334c..4923ea92e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/GaoDeMapCrawl.groovy @@ -54,12 +54,12 @@ class GaoDeMapCrawl extends BaseBatch{ // def prefix = "road_" // def categorys = ["190301"]//µÀ·Ïà¹Ø -// def prefix = "village_" -// def categorys = ["190108","190109"]//´åׯ + def prefix = "village_" + def categorys = ["190108","190109"]//´åׯ - def prefix = "food_" - def categorys = ["050000"] +// def prefix = "food_" +// def categorys = ["050000"] // def prefix = "company_" // def categorys = ["170000","170100","170200","170201","170202","170203","170204","170205","170206","170207","170208","170209","170300","170400","170401","170402","170403","170404","170405","170406","170407","170408"] @@ -121,8 +121,8 @@ class GaoDeMapCrawl extends BaseBatch{ def run(){//,"Î÷°²","ÖØÇì" //def citys = ["ÉϺ£","ÖØÇì","¹þ¶û±õ","ÉòÑô","¶«Ý¸","Äϲý","À¥Ã÷","½ð»ª","ÎÂÖÝ","×Ͳ©","Õ¿½­","ÕØÇì","Ò˲ý","ÔÀÑô","°²Çì","Îߺþ","Î÷Äþ","ÈÕÕÕ","³£µÂ","ÕżҿÚ","±±¾©","¹ãÖÝ","ÉîÛÚ","ÖØÇì","Ö£ÖÝ","³¤É³","Î÷°²","³É¶¼","¶«Ý¸","·ðɽ","º¼ÖÝ","ºÏ·Ê","ÄϾ©","Çൺ","ÉòÑô","ËÕÖÝ","Ìì½ò","Î人","Ö麣","ÖÐɽ","³¤´º","ÑïÖÝ","ÑĮ̀","ÐìÖÝ","ÎÞÎý","ÎÂÖÝ","̫ԭ","̨ÖÝ","ʯ¼Òׯ","ÉÜÐË","ÏÃÃÅ","ȪÖÝ","Äþ²¨","ÄÏͨ","ÄÏÄþ","Äϲý","À¼ÖÝ","³£ÖÝ","´óÁ¬","¸£ÖÝ","¹óÑô","¹þ¶û±õ","º£¿Ú","»ÝÖÝ","¼ÃÄÏ","¼ÎÐË","½ð»ª","À¥Ã÷","×ñÒå","×Ͳ©","ÖêÖÞ","Õò½­","ÕØÇì","ÕÄÖÝ","Õ¿½­","ÔÀÑô","Òø´¨","Ò˲ý","ÑγÇ","Îߺþ","ÎÚ³ľÆë","ÌÆÉ½","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇåÔ¶","ÇØ»Êµº","Âí°°É½","ÂåÑô","ÁøÖÝ","Á¬ÔƸÛ","ÀÈ·»","¾Å½­","¼ªÁÖ","»´°²","ºþÖÝ","ºôºÍºÆÌØ","²×ÖÝ","±£¶¨","°²Çì","ÕżҿÚ","Î÷Äþ","ÈÕÕÕ","À­Èø","½õÖÝ","´óͬ","³£µÂ","±±º£","ÎIJý","ÁêË®","±£Í¤"] - def citys = ["ÄϾ©","ËÕÖÝ","ÎÞÎý","ÑïÖÝ","³£ÖÝ","ÐìÖÝ","Õò½­","ÄÏͨ","Ì©ÖÝ","Á¬ÔƸÛ","ÑγÇ","»´°²","ËÞǨ","º¼ÖÝ","Äþ²¨","ÎÂÖÝ","¼ÎÐË","̨ÖÝ","ºþÖÝ","ÉÜÐË","½ð»ª","ÖÛɽ","áéÖÝ","ÀöË®"] - def allcitys = ["ÉϺ£"]//CommonUtils.findAllCity() + def citys = ["ÉϺ£","ÄϾ©","ËÕÖÝ","ÎÞÎý","ÑïÖÝ","³£ÖÝ","ÐìÖÝ","Õò½­","ÄÏͨ","Ì©ÖÝ","Á¬ÔƸÛ","ÑγÇ","»´°²","ËÞǨ","º¼ÖÝ","Äþ²¨","ÎÂÖÝ","¼ÎÐË","̨ÖÝ","ºþÖÝ","ÉÜÐË","½ð»ª","ÖÛɽ","áéÖÝ","ÀöË®"] + def allcitys = CommonUtils.findAllCity() def totalCount = 0; for(def city : allcitys){ 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 3a182be6a..e05d00dfa 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,11 +48,11 @@ class YouDaDataParser { def final AtomicInteger count_ = new AtomicInteger(0) - static def statDate = "2021-09-01" + static def statDate = "2021-10-01" static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//ÓÑ´ïÒ»ÊÖ·¿´æÈëmongo - task.esfParser();//ÓÑ´ï¶þÊÖ·¿´æÈëmongo +// task.esfParser();//ÓÑ´ï¶þÊÖ·¿´æÈëmongo // task.newhouseToSaveEs();//з¿±£´æµ½es task.esfhouseToSaveEs();//¶þÊÖ·¿±£´æµ½es // task.updateFinishDateByEsfTrade();//¸ù¾Ý¶þÊֳɽ»µÄ¿¢¹¤Ê±¼äÐÞ¸Äseaweed¿âÖеĿ¢¹¤Ê±¼ä @@ -285,7 +285,7 @@ class YouDaDataParser { def esfParser(){ - def files = ["D:\\Êý¾Ý\\ÓÑ´ï\\2021Äê10ÔÂ\\¶þÊÖ·¿\\²éѯ1.DBF"] + def files = ["D:\\Êý¾Ý\\ÓÑ´ï\\2021Äê11ÔÂ\\¶þÊÖ·¿\\²éѯ1.DBF"] def datas = [] for(def fileName : files){ def rows = readDBF(fileName); 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 a418cebb9..9557d9c92 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 @@ -73,31 +73,43 @@ class CcbCodeUtils { static def parseBuildType(def buildType){ if(buildType){ + def types = [] if(buildType.contains("ÀÏʽ±ðÊûÑó·¿")){ - return "0112" - }else if(buildType.contains("ËĺÏÔº")){ - return "0111" - }else if(buildType.contains("»¨Ô°Ñó·¿")){ - return "0110" - }else if(buildType.contains("ÀÏÑó·¿")){ - return "0109" - }else if(buildType.contains("µþÆ´")){ - return "0107" - }else if(buildType.contains("ÁªÅÅ")){ - return "0106" - }else if(buildType.contains("¶À¶°")){ - return "0105" - }else if(buildType.contains("¶à²ã")){ - return "0104" - }else if(buildType.contains("³¬¸ß²ã")){ - return "0108" - }else if(buildType.contains("С¸ß²ã")){ - return "0103" - }else if(buildType.contains("¸ß²ã")){ - return "0102" + types << "0112" } + if(buildType.contains("ËĺÏÔº")){ + types << "0111" + } + if(buildType.contains("»¨Ô°Ñó·¿")){ + types << "0110" + } + if(buildType.contains("ÀÏÑó·¿")){ + types << "0109" + } + if(buildType.contains("µþÆ´")){ + types << "0107" + } + if(buildType.contains("ÁªÅÅ")){ + types << "0106" + } + if(buildType.contains("¶À¶°")){ + types << "0105" + } + if(buildType.contains("¶à²ã")){ + types << "0104" + } + if(buildType.contains("³¬¸ß²ã")){ + types << "0108" + } + if(buildType.contains("С¸ß²ã")){ + types << "0103" + } + if(buildType.contains("¸ß²ã")){ + types << "0102" + } + return types } - return "0199" + return ["0199"] } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/AddDistrictFieldValue.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/AddDistrictFieldValue.groovy index ed07e1dee..92e8f1555 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/AddDistrictFieldValue.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/AddDistrictFieldValue.groovy @@ -10,6 +10,7 @@ import com.fangjia.script.util.DataUtil import com.fangjia.script.util.DateUtils import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject import com.mongodb.DBObject import com.rabbitmq.client.AMQP @@ -36,7 +37,25 @@ class AddDistrictFieldValue { } def run(){ - def citys = ["ÉòÑô","¹þ¶û±õ","¼ªÁÖ","×ñÒå","×Ͳ©","Î÷Äþ","Çൺ","´óÁ¬","Äþ²¨"]//CcbCommonUtils.citys; + +// ExcelUtils.multiThreadingModify("d:\\Êý¾Ý\\ÉϺ£Â¥ÅÌ»§Êý.xlsx",{d-> +// def source = d['F'] +// if(!source){ +// def rows = findMatch(d['B'], d['C'], d['D']); +// if(rows){ +// if(rows.size()==1){ +// def obj = rows[0] +// d['G'] = obj.house_count +// d['H'] = obj.region +// d['I'] = obj.name +// }else{ +// println d['B']+" "+d['C']+" "+d['D']+" ¶à¸ö" +// } +// } +// } +// }) + +// def citys = ["ÉòÑô","¹þ¶û±õ","¼ªÁÖ","×ñÒå","×Ͳ©","Î÷Äþ","Çൺ","´óÁ¬","Äþ²¨"]//CcbCommonUtils.citys; //µÚÈý·½¾ù¼ÛÊý¾ÝÆ¥Åä // for(def city : citys){ // def rets = findAllDataByCity(city) @@ -45,17 +64,137 @@ class AddDistrictFieldValue { //µÚÈý·½¾ù¼ÛÊý¾ÝÌî²¹ // for(def city : citys){ -// def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","name_cat"]) +//// def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","name_cat"]) // def rMap = getMatchDistrict(city) // createResultValue(dists, rMap) // } - // - for(def city : citys){ - def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","name_cat","open_date","build_date","live_date", "build_type"]) -// addFinishDate(dists) - addFieldValueByHouse(dists) +// for(def city : citys){ +// def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","name_cat","open_date","build_date","live_date", "build_type"]) +//// addFinishDate(dists) +// addFieldValueByHouse(dists) +// } + +// def citys = ["ÉϺ£"] +// def updateIndex = 0 +// for(def city : citys){ +// def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region", "name", "household_count", "alias"]) +// def total = dists.size() +// for(def dist : dists){ +// def details = findDistrictDetail(dist) +// if(details){ +// for(def d : details){ +// def region = RegionData.formatRegion(city, d.region) +// if(d.region == region){ +// if(!dist.household_count || (dist.household_count && dist.household_count!=d.house_count)){ +// updateIndex++ +// def udata = new BasicDBObject() +// udata.put("household_count", d.house_count.toInteger()) +// udata.put("m_date", new Date()) +// def q = new BasicDBObject() +// q.put("_id", dist._id) +// println updateIndex +"/${total} "+d.city +" "+d.name+" old-vale:"+dist.household_count+" new-value:"+d.house_count +// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) +// } +// } +// } +// } +// } +// } + + + def citys = ["ÉϺ£"] + def updateIndex = 0 + def rets = [] + rets << ["±àºÅ", "³ÇÊÐ", "ÇøÓò", "Ãû³Æ","»§Êý", "·¿¼ÛÍøÂ¥¶°Êý","½¨ÐÐÂ¥¶°Êý","À´Ô´"] + for(def city : citys){ + def dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region", "name", "household_count","loudong_count", "alias"]) + def total = dists.size() + + for(def dist : dists){ + if(dist.household_count){ + def ret = [] + ret << dist._id.toString() + ret << dist.city + ret << dist.region + ret << dist.name + ret << dist.household_count + ret << dist.loudong_count + def details = findDistrictDetail(dist) + if(details){ + for(def d : details){ + def region = RegionData.formatRegion(city, d.region) + if(d.region == region){ + if(dist.household_count && dist.household_count==d.house_count){ + ret << d.loudong_count + ret << "Á´¼Ò" +// updateIndex++ +// def udata = new BasicDBObject() +// udata.put("household_count", d.house_count.toInteger()) +// udata.put("m_date", new Date()) +// def q = new BasicDBObject() +// q.put("_id", dist._id) +// println updateIndex +"/${total} "+d.city +" "+d.name+" old-vale:"+dist.household_count+" new-value:"+d.house_count +// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + } + } + } + }else{ + ret << "" + ret << "" + } + + rets << ret + } } + ExcelUtils.write("d:\\Êý¾Ý\\ÉϺ£Â¥ÅÌ»§Êý.xlsx", rets, "Êý¾Ý") + } + } + + + def findMatch(city, region, name){ + def q = new BasicDBObject() + q.put("root", "lianjia.com") + q.put("match_city", city) + q.put("match_region", region) + q.put("match_name", name) + q.put("house_count", new BasicDBObject('$gte', 0)) + def dbcorsor = detailColl.find(q) + def rows = [] + for(def d : dbcorsor){ + rows << d + } + return rows + } + + def findDistrictDetail(dist){ + def q = new BasicDBObject() + q.put("city", dist.city) + q.put("house_count", new BasicDBObject('$gte', 0)) + q.put("root", "lianjia.com") + + def alias = [] + if(dist.alias){ + if(!dist.alias.contains(dist.name)){ + dist.alias << dist.name + } + alias = dist.alias + }else{ + alias << dist.name + } + + if(dist.name.toString().endsWith("ÅªÐ¡Çø")||dist.name.toString().endsWith("ºÅÐ¡Çø")){ + alias << dist.name.replace("ÅªÐ¡Çø", "Ū").replace("ºÅÐ¡Çø", "ºÅ") + } + if(alias){ + q.put("name", new BasicDBObject('$in', alias)) + } + def dbcorsor = detailColl.find(q) + def rows = [] + for(def d : dbcorsor){ + rows << d + } + return rows } def match(def rets){ 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 75a441c06..89b54feea 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 @@ -782,6 +782,7 @@ class DataStandardBatch extends BaseBatch{ def findAllNoMatchData(){ DBObject qdata = new BasicDBObject(); qdata.put("s_date", SHORT_DATE) + qdata.put("city", "¸£ÖÝ") qdata.put("status", new BasicDBObject(QueryOperators.EXISTS, false)); def ret = [] try{ 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 145cd5ff8..fb2c38235 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, 202010); + def source = "58ͬ³Ç"// + def citys = findCrawlCity(source, 202107); for(def city : citys){ - def count1 = findCount(source, city, 202010); - def count2 = findCount(source, city, 202011); + def count1 = findCount(source, city, 202107); + def count2 = findCount(source, city, 202110); println city +" "+count1+" "+count2 // println count1 // println "--- ----" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy index bc1909c72..d7e1021de 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/Esf58Crawl.groovy @@ -37,19 +37,19 @@ class Esf58Crawl extends BaseBatch{ def static final distMap = [:] def static useDistKeys = [] static def totalCount = new AtomicLong() - - def cityList = [ - "ºÏ·Ê":"hf|837","Îߺþ":"wuhu|2045","°ö²º":"bengbu|3470","¸·Ñô":"fy|2325","»´ÄÏ":"hn|2319", - "°²Çì":"anqing|3251","ËÞÖÝ":"suzhou|3359","Áù°²":"la|2328","»´±±":"huaibei|9357","³üÖÝ":"chuzhou|10266", +//"¸£ÖÝ":"fz|304","ºÏ·Ê":"hf|837","Îߺþ":"wuhu|2045","°ö²º":"bengbu|3470","¸·Ñô":"fy|2325","»´ÄÏ":"hn|2319", +// "°²Çì":"anqing|3251","ËÞÖÝ":"suzhou|3359","Áù°²":"la|2328","ÉîÛÚ":"sz|4","±±¾©":"bj|1","ÉϺ£":"sh|2","Ìì½ò":"tj|18","ÖØÇì":"cq|37","¹ãÖÝ":"gz|3","¶«Ý¸":"dg|413","·ðɽ":"fs|222", + def cityList = ["º¼ÖÝ":"hz|79", "³É¶¼":"cd|102","ʯ¼Òׯ":"sjz|241","Çൺ":"qd|122","ÄϾ©":"nj|172","¼ÎÐË":"jx|497","´óÁ¬":"dl|147","ÎÚ³ľÆë":"xj|984","̫ԭ":"ty|740", + "Î÷°²":"xa|483","ËÕÖÝ":"su|5","ÎÞÎý":"wx|93","Ϋ·»":"wf|362","³£ÖÝ":"cz|463", + "»´±±":"huaibei|9357","³üÖÝ":"chuzhou|10266", "Âí°°É½":"mas|2039","Í­Áê":"tongling|10285","Ðû³Ç":"xuancheng|5633","ÙñÖÝ":"bozhou|2329","»ÆÉ½":"huangshan|2323", "³ØÖÝ":"chizhou|10260","³²ºþ":"ch|10229","ºÍÏØ":"hexian|10892","»ôÇñ":"hq|11226","Í©³Ç":"tongcheng|11296", "Äþ¹ú":"ningguo|5645","Ì쳤":"tianchang|10273","¶«ÖÁ":"dongzhi|10262","ÎÞΪ":"wuweixian|10232", - "¸£ÖÝ":"fz|304","ÏÃÃÅ":"xm|606","ȪÖÝ":"qz|291","ÆÎÌï":"pt|2429","ÕÄÖÝ":"zhangzhou|710", + "ÏÃÃÅ":"xm|606","ȪÖÝ":"qz|291","ÆÎÌï":"pt|2429","ÕÄÖÝ":"zhangzhou|710", "ÄþµÂ":"nd|7951","ÈýÃ÷":"sm|2048","ÄÏÆ½":"np|10291","ÁúÑÒ":"ly|6752","ÎäÒÄɽ":"wuyishan|10761", "ʯʨ":"shishi|296","½ú½­":"jinjiangshi|297","Äϰ²":"nananshi|293","Áúº£":"longhai|713","ÉϺ¼":"shanghangxian|6757", "¸£°²":"fuanshi|7969","¸£¶¦":"fudingshi|7970","°²Ïª":"anxixian|7100","ÓÀ´º":"yongchunxian|7101","ÓÀ°²":"yongan|2133", - "ÕÄÆÖ":"zhangpu|717", - "ÉîÛÚ":"sz|4","¹ãÖÝ":"gz|3","¶«Ý¸":"dg|413","·ðɽ":"fs|222","ÖÐɽ":"zs|771", + "ÕÄÆÖ":"zhangpu|717", "ÖÐɽ":"zs|771", "Ö麣":"zh|910","»ÝÖÝ":"huizhou|722","½­ÃÅ":"jm|629","ÉÇÍ·":"st|783","Õ¿½­":"zhanjiang|791", "ÕØÇì":"zq|901","ïÃû":"mm|679","½ÒÑô":"jy|927","÷ÖÝ":"mz|9389","ÇåÔ¶":"qingyuan|7303", "Ñô½­":"yj|2284","ÉØ¹Ø":"sg|2192","ºÓÔ´":"heyuan|10467","ÔÆ¸¡":"yf|10485","ÉÇβ":"sw|9449", @@ -99,7 +99,7 @@ class Esf58Crawl extends BaseBatch{ "Æî¶«":"qidongxian|5690","ºâ¶«":"hengdong|5693","ÀäË®½­":"lengshuijiangshi|9470","Á°Ô´":"lianyuanshi|9471","Ë«·å":"shuangfengxian|9473", "ÉÛÑôÏØ":"shaoyangxian|6955","ÉÛ¶«":"shaodongxian|6954","ãä½­":"yuanjiangs|10201","ÄÏÏØ":"nanxian|10202","ÆîÑô":"qiyang|8532", "ÏæÒõ":"xiangyin|828","»ªÈÝ":"huarong|830","´ÈÀû":"cilixian|6791","ØüÏØ":"zzyouxian|1095", - "ʯ¼Òׯ":"sjz|241","±£¶¨":"bd|424","ÌÆÉ½":"ts|276","ÀÈ·»":"lf|772","ºªµ¦":"hd|572", + "±£¶¨":"bd|424","ÌÆÉ½":"ts|276","ÀÈ·»":"lf|772","ºªµ¦":"hd|572", "ÇØ»Êµº":"qhd|1078","²×ÖÝ":"cangzhou|652","ÐĮ̈":"xt|751","ºâË®":"hs|993","ÕżҿÚ":"zjk|3328", "³ÐµÂ":"chengde|6760","¶¨ÖÝ":"dingzhou|8398","¹ÝÌÕ":"gt|8706","Õű±":"zhangbei|11201","ÕÔÏØ":"zx|9048", "Õý¶¨":"zd|3198","Ǩ°²ÊÐ":"qianan|284","ÈÎÇð":"renqiu|656","ÈýºÓ":"sanhe|776","Îä°²":"wuan|577", @@ -107,7 +107,7 @@ class Esf58Crawl extends BaseBatch{ "²×ÏØ":"cangxian|659","´ÅÏØ":"cixian|591","ÉæÏØ":"shexian|14059","°ÔÖÝ":"bazhou|775","ÏãºÓ":"xianghe|5395", "¹Ì°²":"lfguan|12803","×ñ»¯ÊÐ":"zunhua|283","ǨÎ÷":"qianxixian|7061","ÓñÌï":"yutianxian|7060","ÂÐÄÏ":"luannanxian|7066", "ɳºÓ":"shaheshi|755", - "ËÕÖÝ":"su|5","ÄϾ©":"nj|172","ÎÞÎý":"wx|93","³£ÖÝ":"cz|463","ÐìÖÝ":"xz|471", + "ÐìÖÝ":"xz|471", "ÄÏͨ":"nt|394","ÑïÖÝ":"yz|637","ÑγÇ":"yancheng|613","»´°²":"ha|968","Á¬ÔƸÛ":"lyg|2049", "Ì©ÖÝ":"taizhou|693","ËÞǨ":"suqian|2350","Õò½­":"zj|645","ãðÑô":"shuyang|5772","´ó·á":"dafeng|11279", "Èç¸Þ":"rugao|397","Æô¶«":"qidong|400","äàÑô":"liyang|469","º£ÃÅ":"haimen|399","¶«º£":"donghai|2147", @@ -126,7 +126,7 @@ class Esf58Crawl extends BaseBatch{ "°×³Ç":"bc|5918","ͨ»¯":"th|10159","°×ɽ":"baishan|10179","ÁÉÔ´":"liaoyuan|2501","¹«Ö÷Áë":"gongzhuling|10171", "÷ºÓ¿Ú":"meihekou|10162","·öÓà":"fuyuxian|9085","³¤Áë":"changlingxian|9084","èëµé":"huadian|706","ÅÍʯ":"panshi|708", "ÀæÊ÷ÏØ":"lishu|10176", - "ÉòÑô":"sy|188","´óÁ¬":"dl|147","°°É½":"as|523","½õÖÝ":"jinzhou|2354","¸§Ë³":"fushun|5722", + "ÉòÑô":"sy|188","°°É½":"as|523","½õÖÝ":"jinzhou|2354","¸§Ë³":"fushun|5722", "Óª¿Ú":"yk|5898","Å̽õ":"pj|2041","³¯Ñô":"cy|10106","µ¤¶«":"dandong|3445","ÁÉÑô":"liaoyang|2038", "±¾Ïª":"benxi|5845","ºù«µº":"hld|10088","ÌúÁë":"tl|6729","¸·ÐÂ":"fx|10097","ׯºÓ":"pld|3306", "Íß·¿µê":"wfd|3279","µÆËþ":"dengta|2071","·ï³Ç":"fengcheng|3450","±±Æ±":"beipiao|10109","¿ªÔ­":"kaiyuan|6733", @@ -136,7 +136,7 @@ class Esf58Crawl extends BaseBatch{ "ÎÚº£":"wuhai|2404","°¢À­ÉÆÃË":"alsm|10083","º£À­¶û":"hlr|2043", "Î÷Äþ":"xn|2052","º£Î÷":"hx|9902","º£±±":"haibei|9917","¹ûÂå":"guoluo|9936","º£¶«":"haidong|9909", "»ÆÄÏ":"huangnan|9896","ÓñÊ÷":"ys|9888","º£ÄÏ":"hainan|10574","¸ñ¶ûľ":"geermushi|9904", - "Çൺ":"qd|122","¼ÃÄÏ":"jn|265","ÑĮ̀":"yt|228","Ϋ·»":"wf|362","ÁÙÒÊ":"linyi|505", + "¼ÃÄÏ":"jn|265","ÑĮ̀":"yt|228","ÁÙÒÊ":"linyi|505", "×Ͳ©":"zb|385","¼ÃÄþ":"jining|450","Ì©°²":"ta|686","ÁijÇ":"lc|882","Íþº£":"weihai|518", "Ôæ×¯":"zaozhuang|961","µÂÖÝ":"dz|728","ÈÕÕÕ":"rizhao|3177","¶«Óª":"dy|623","ºÊÔó":"heze|5632", "±õÖÝ":"bz|944","À³Îß":"lw|2292","ÕÂÇð":"zhangqiu|8680","¿ÑÀû":"kl|11313","Öî³Ç":"zc|9146", @@ -151,20 +151,20 @@ class Esf58Crawl extends BaseBatch{ "ãëÉÏ":"wenshang|460","ÁºÉ½":"liangshanx|462","Àû½ò":"lijin|628","ÒÊÄÏ":"yinanxian|7301","ÆÜϼ":"qixia|238", "ÄþÑô":"ningyang|691","¶«Æ½":"dongping|692","²ýÒØ":"changyishi|372","°²Çð":"anqiu|370","²ýÀÖ":"changle|373", "ÁÙëÔ":"linqu|374","Û²³Ç":"juancheng|5635", - "̫ԭ":"ty|740","ÁÙ·Ú":"linfen|5669","´óͬ":"dt|6964","Ô˳Ç":"yuncheng|5653","½úÖÐ":"jz|8854", + "ÁÙ·Ú":"linfen|5669","´óͬ":"dt|6964","Ô˳Ç":"yuncheng|5653","½úÖÐ":"jz|8854", "³¤ÖÎ":"changzhi|6921","½ú³Ç":"jincheng|3350","ÑôȪ":"yq|8760","ÂÀÁº":"lvliang|3222","ÐÃÖÝ":"xinzhou|3453", "Ë·ÖÝ":"shuozhou|9871","ÁÙâ¢":"linyixian|9193","ÇåÐì":"qingxu|10908","ÁøÁÖ":"liulin|3225","¸ßƽ":"gaoping|3354", "ÔóÖÝ":"zezhou|3353","ÏåÔ«":"xiangyuanxian|6928","ТÒå":"xiaoyi|3227", - "Î÷°²":"xa|483","ÏÌÑô":"xianyang|7453","±¦¼¦":"baoji|2044","μÄÏ":"wn|5733","ººÖÐ":"hanzhong|3163", + "ÏÌÑô":"xianyang|7453","±¦¼¦":"baoji|2044","μÄÏ":"wn|5733","ººÖÐ":"hanzhong|3163", "ÓÜÁÖ":"yl|5942","ÑÓ°²":"yanan|8973","°²¿µ":"ankang|3157","ÉÌÂå":"sl|9854","Í­´¨":"tc|9832", "Éñľ":"shenmu|5944","º«³Ç":"hancheng|5735","¸®¹È":"fugu|5945","¾¸±ß":"jingbian|5947","¶¨±ß":"dingbian|5948", - "³É¶¼":"cd|102","ÃàÑô":"mianyang|1057","µÂÑô":"deyang|2373","Äϳä":"nanchong|2378","Ò˱ö":"yb|2380", + "ÃàÑô":"mianyang|1057","µÂÑô":"deyang|2373","Äϳä":"nanchong|2378","Ò˱ö":"yb|2380", "×Ô¹±":"zg|6745","ÀÖɽ":"ls|3237","ãòÖÝ":"luzhou|2372","´ïÖÝ":"dazhou|9799","ÄÚ½­":"scnj|5928", "ËìÄþ":"suining|9688","ÅÊÖ¦»¨":"panzhihua|2371","üɽ":"ms|9704","¹ã°²":"ga|2381","×ÊÑô":"zy|6803", "Á¹É½":"liangshan|9717","¹ãÔª":"guangyuan|9749","ÑŰ²":"ya|9687","°ÍÖÐ":"bazhong|9811","°¢°Ó":"ab|9817", "¸Ê×Î":"ganzi|9764","°²ÔÀ":"anyuexian|6806","¹ãºº":"guanghanshi|8719","¼òÑô":"jianyangshi|6805","ÈÊÊÙ":"renshouxian|9706", "Éäºé":"shehongxian|9694","´óÖñ":"dazu|9806","Ðûºº":"xuanhan|9804","ÇþÏØ":"qux|9807","³¤Äþ":"changningx|7148", - "ÎÚ³ľÆë":"xj|984","²ý¼ª":"changji|8582","°ÍÒô¹ùÀã":"bygl|9530","ÒÁÀç":"yili|9472","°¢¿ËËÕ":"aks|9499", + "²ý¼ª":"changji|8582","°ÍÒô¹ùÀã":"bygl|9530","ÒÁÀç":"yili|9472","°¢¿ËËÕ":"aks|9499", "¿¦Ê²":"ks|9326","¹þÃÜ":"hami|7452","¿ËÀ­ÂêÒÀ":"klmy|2042","²©¶ûËþÀ­":"betl|9529","ͳ·¬":"tlf|9475", "ºÍÌï":"ht|9489","ʯºÓ×Ó":"shz|9551","¿Ë×ÎÀÕËÕ":"kzls|9519","°¢À­¶û":"ale|9539","Îå¼ÒÇþ":"wjq|9562", "Í¼Ä¾Êæ¿Ë":"tmsk|9559","¿â¶ûÀÕ":"kel|7168","°¢ÀÕÌ©":"alt|18837","Ëþ³Ç":"tac|18845", @@ -174,7 +174,7 @@ class Esf58Crawl extends BaseBatch{ "Àö½­":"lj|2392","ÎÄɽ":"ws|2395","³þÐÛ":"cx|2393","Î÷Ë«°æÄÉ":"bn|2397","ÕÑͨ":"zt|9409", "µÂºê":"dh|9437","ÆÕ¶ý":"pe|9444","±£É½":"bs|2390","ÁÙ²×":"lincang|9422","µÏÇì":"diqing|9432", "Å­½­":"nujiang|9462","ÃÖÀÕ":"milexian|8892","°²Äþ":"anningshi|547","ÐûÍþ":"xuanwushi|7533", - "º¼ÖÝ":"hz|79","Äþ²¨":"nb|135","ÎÂÖÝ":"wz|330","½ð»ª":"jh|531","¼ÎÐË":"jx|497", + "Äþ²¨":"nb|135","ÎÂÖÝ":"wz|330","½ð»ª":"jh|531", "̨ÖÝ":"tz|403","ÉÜÐË":"sx|355","ºþÖÝ":"huzhou|831","ÀöË®":"lishui|7921","áéÖÝ":"quzhou|6793", "ÖÛɽ":"zhoushan|8481","ÀÖÇå":"yueqingcity|13950","Èð°²":"ruiancity|13951","ÒåÎÚ":"yiwu|12291","ÓàÒ¦":"yuyao|5333", "Öîôß":"zhuji|357","Ïóɽ":"xiangshanxian|6738","ÎÂÁë":"wenling|408","Í©Ïç":"tongxiang|502","´ÈϪ":"cixi|5334", @@ -191,11 +191,11 @@ class Esf58Crawl extends BaseBatch{ void process(Object args) { //addContent("¸£ÖÝ","https://fz.58.com/xiaoqu/", 70); - def citys = ["³É¶¼","¹ãÖÝ","ÉîÛÚ","º¼ÖÝ","ÄϾ©","Ö£ÖÝ","ËÕÖÝ","Î人","Çൺ","ʯ¼Òׯ","̫ԭ","¼ÃÄÏ","³¤É³","ÉòÑô","Äþ²¨","·ðɽ","Ö麣","À¥Ã÷","ÎÂÖÝ","ÎÞÎý","¹þ¶û±õ","ÄÏÄþ","¶«Ý¸","´óÁ¬","º£¿Ú","Ϋ·»","ÃàÑô","ÎÚ³ľÆë","»ÝÖÝ"] + def citys = ["Ö£ÖÝ"] cityList.each{city, str-> for(def i=0;i<1;i++){ // def city = "¸£ÖÝ" - if(citys.contains(city)){ +// if(citys.contains(city)){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name"]); if(districts){ def arrs = str.split("\\|") @@ -207,7 +207,7 @@ class Esf58Crawl extends BaseBatch{ // Thread.sleep(1000*60*10) } - } +// } } } @@ -322,7 +322,7 @@ class Esf58Crawl extends BaseBatch{ } def avg_price = JQueryUtils.selectText(".price", detailDocument); def region; - def addr = JQueryUtils.selectText(".desc", detailDocument); + def addr = JQueryUtils.selectText("td:contains(ÏêϸµØÖ·)+td", detailDocument); if(info){ if(info.size()>=4){ city = info[2].replace("Ð¡Çø","").trim() 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 7ae95777c..e870f26ab 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 @@ -16,8 +16,8 @@ class SynchDistrictPrice { def thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); def districtDetailColl = CrawalDBUtil.getDistrictDetailColl(); // def sourceMap = ["jiwu.com":"¼ªÎÝ","58.com":"58ͬ³Ç","lianjia.com":"Á´¼Ò","ke.com":"±´¿ÇÕÒ·¿","fang.com":"ËÑ·¿","fangdd.com":"·¿¶à¶à","house365.com":"365ÌÔ·¿", -// "anjuke.com":"°²¾Ó¿Í","cityhouse.cn":"³ÇÊз¿²ú"] - def sourceMap = ["cityhouse.cn":"³ÇÊз¿²ú"]//["zhuge.com":"Öî¸ðÕÒ·¿","5i5j.com":"ÎÒ°®ÎÒ¼Ò"] +// "anjuke.com":"°²¾Ó¿Í","cityhouse.cn":"³ÇÊз¿²ú","zhuge.com":"Öî¸ðÕÒ·¿","5i5j.com":"ÎÒ°®ÎÒ¼Ò"] + def sourceMap = ["fang.com":"ËÑ·¿"] static main(args) { def task = new SynchDistrictPrice() task.run() 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 e299c60f6..80d802c97 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, 202108); - def count2 = findTotalCount(source, 202109); + def count1 = findTotalCount(source, 202109); + def count2 = findTotalCount(source, 202110); println source +" "+count1 +" "+count2 } } 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 6296d9ba8..5ef52da25 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 @@ -122,8 +122,9 @@ public class OpenApiClient { } String content = new HttpRequest().get("http://open.fangjia.com/address/matchV2", params, "utf-8") +// String content = new HttpRequest().get("http://localhost:8080/fangjia-open/address/matchV2", params, "utf-8") while (content == null) { - content = new HttpRequest().get("http:///open.fangjia.com/address/matchV2", params, "utf-8") + content = new HttpRequest().get("http://open.fangjia.com/address/matchV2", params, "utf-8") println("${city} ${input} ${cat}³ÌÐòµ÷ÓÃÒì³£") Thread.sleep(6000) } 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 785addef5..38f6a9ad7 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("20210901", "yyyyMMdd") -def endDate = DateUtil.parseDate("20211001", "yyyyMMdd") +def startDate = DateUtil.parseDate("20211001", "yyyyMMdd") +def endDate = DateUtil.parseDate("20211101", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy index 8243bde22..fe4bad148 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.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("20210901", "yyyyMMdd") -def endDate = DateUtil.parseDate("20211001", "yyyyMMdd") +def startDate = DateUtil.parseDate("20211001", "yyyyMMdd") +def endDate = DateUtil.parseDate("20211101", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 diff --git a/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java b/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java index 5ba1a9655..00c5979c9 100644 --- a/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java +++ b/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java @@ -80,6 +80,8 @@ public class GetFileServlet2 extends HttpServlet { String reqUrl = req.getRequestURI(); String i = reqUrl.substring(reqUrl.indexOf("/fs/") + 4, reqUrl.length()); + System.out.println(i); + if (StringUtils.isBlank(i)) { resp.setStatus(HttpServletResponse.SC_NOT_FOUND); return; diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ydpx.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ydpx.png new file mode 100644 index 000000000..7d97c3fb4 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ydpx.png differ diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css index 67b83bd14..cbef6ea34 100644 --- a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css @@ -11,6 +11,7 @@ .main_content{margin-bottom:100px;} .main_content p{line-height:28px;text-align:justify;margin-bottom:20px;} .main_content p span{margin-left:20px;} +.main_small{text-align: center; font-size: 20px;margin-top: -30px;margin-bottom: 25px;} /* banner */ .banner{width:100%;height:375px;background:url(../../../images/fangjia/v5/evaluation_banner01.png) no-repeat center center;padding-top:75px;}