From 10726b5d5e49907cbb27f2c9c20bea506ecc9234 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 20 Jun 2022 19:28:59 +0800 Subject: [PATCH 01/19] update --- .../ccbevaluation/BigdataDealBatch.groovy | 74 +++++++++---------- .../ccbevaluation/ThirdPartyPriceBatch.groovy | 6 +- .../script/ccbevaluation/TradeStatLog.groovy | 12 +-- .../gj/paimai/LianjiaCrawlByChrome.groovy | 2 +- .../script/thirdPriceCrawl/DataStat.groovy | 2 +- 5 files changed, 46 insertions(+), 50 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy index f606cd13f..c1ea41780 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy @@ -56,47 +56,43 @@ class BigdataDealBatch extends BaseBatch{ def ccbCitys = CcbCommonUtils.citys; for(def city : citys){ - if(!ccbCitys.contains(city)){ +// if(!ccbCitys.contains(city)){ addDealPriceMatch(city); - } - } -//// println citys.unique().size() -// def rows = [] -// def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] -// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() -// for(def city : citys){ -// def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) -// def ppeDists = [:] -//// if(["贵阳","佛山","杭州","沈阳","天津","中山","徐州","绍兴","南通","哈尔滨","惠州","长沙","青岛","长春","烟台","温州","太原","台州","石家庄","宁波","常州","大连","嘉兴","金华","昆明"].contains(city)){ -//// ppeDists = getPpeGTE15Datas(city) -//// } -// -// def statMap = [:]//getDistrictStatByCity(city, weekend) -// if(city=="上海"){ -// def youDataTrade = getYouDaData(statMap) -// def youdaDatas = createData(youDataTrade, cityCodeDataMap, distCodeMap, "youda") -// rows.addAll(youdaDatas) -// println city +" "+youdaDatas.size() // } -// -// -// def trades = getCityData(city, statMap, ppeDists) -// def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") -// rows.addAll(rets) -// println city +" 成交共:"+rets.size() -// -// def cityDatas = [] -// cityDatas << headers -// cityDatas.addAll(rows) -// } -// -// def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" -// if(CommonDatautils.isWindow()){ -// fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" -// } -// -// FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); -// println "txt 生成" + } + def rows = [] + def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + for(def city : citys){ + def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) + def ppeDists = [:] + + def statMap = [:]//getDistrictStatByCity(city, weekend) + if(city=="上海"){ + def youDataTrade = getYouDaData(statMap) + def youdaDatas = createData(youDataTrade, cityCodeDataMap, distCodeMap, "youda") + rows.addAll(youdaDatas) + println city +" "+youdaDatas.size() + } + + + def trades = getCityData(city, statMap, ppeDists) + def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") + rows.addAll(rets) + println city +" 成交共:"+rets.size() + + def cityDatas = [] + cityDatas << headers + cityDatas.addAll(rows) + } + + def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" + if(CommonDatautils.isWindow()){ + fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" + } + + FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); + println "txt 生成" } 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 d1cc4209b..fcfd4c0bd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap @BatchOwner(Watcher.GaoJuan) class ThirdPartyPriceBatch extends BaseBatch { - def sDate= 202204//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - def startDate = 202202 - def endDate = 202204 + def sDate= 202205//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def startDate = 202203 + def endDate = 202205 def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM")); static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") 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 3b3e6a7c5..fc73e4867 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 @@ -75,13 +75,13 @@ class TradeStatLog { def run(){ def citys = CcbCommonUtils.citys; def rets = [] - rets << ["城市","2月总量","3月总量","4月总量","占比","贝壳","链家", "我爱我家","房天下","中原"] + rets << ["城市","3月总量","4月总量","5月总量","占比","贝壳","链家", "我爱我家","房天下","中原"] def sources = ["贝壳找房","链家在线", "我爱我家","房天下","中原地产"] //def startDate = "2021-05-01" - def startDate = "2022-02-01" - def date = "2022-03-01" - def endDate = "2022-04-01" - def newDate = "2022-05-01" + def startDate = "2022-03-01" + def date = "2022-04-01" + def endDate = "2022-05-01" + def newDate = "2022-06-01" for(def city : citys){ def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) @@ -131,7 +131,7 @@ class TradeStatLog { } - ExcelUtils.write("D:\\数据\\建行\\房产估值\\成交\\2022-04成交统计.xlsx", rets, "数据") + ExcelUtils.write("D:\\数据\\建行\\房产估值\\成交\\2022-05成交统计.xlsx", rets, "数据") println "表格生成完成" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy index f94fd7fc7..ebe6f911a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy @@ -34,7 +34,7 @@ public class LianjiaCrawlByChrome { static main(args) { def task = new LianjiaCrawlByChrome(); - task.run() +// task.run() // task.run1() task.addDealRegion(); task.standardRegion() 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 aa363f85b..ec9d7f64b 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,7 +40,7 @@ class DataStat { def run(){ - def source = "58同城"// + def source = "贝壳找房"// def citys = findCrawlCity(source, 202202); for(def city : citys){ def count1 = findCount(source, city, 202204); From a43bf5b56e6487cfe41719b0c58ac0d4db576db6 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 21 Jun 2022 11:31:14 +0800 Subject: [PATCH 02/19] update --- .../script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy index e644e9882..3c2bcde38 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy @@ -43,7 +43,7 @@ class ThirdDataToGatherBatch extends BaseBatch{ @Override void process(Object args) { println SHORT_DATE - def citys = ["福州"]//CommonDatautils.findAllCity(); + def citys = CommonDatautils.findAllCity(); def weekend = DateUtils.getFirstDayOfWeek(new Date()); //def weekend = DateUtils.getFirstDayOfWeek(DateUtils.parseFromTightYYYYMMDD("2021-07-15")); def cityIndex = 0; From a1a432f9207aec01fc941ee2bda0ff5439fc2f9c Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 21 Jun 2022 11:42:51 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE?= =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/SaleLeadsController.java | 34 ++++++++++++++- .../src/main/webapp/saleLeads/apply.ftl | 42 +++++++++++++++---- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 9596069f4..a42c95280 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -6,12 +6,19 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URLEncoder; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.logging.Handler; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.fangjia.core.util.DataUtil; +import com.fangjia.core.util.DingDingMessageUtil; +import com.fangjia.core.util.HttpRequest; +import com.fangjia.core.util.HttpRequestException; +import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import com.fangjia.coresite.model.JsonModel; @@ -129,8 +136,33 @@ public class SaleLeadsController { } saleLeads = converValue(saleLeads); + String body = + "业务需求:" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" + + "姓名:" + saleLeads.getUname() + "\n\n" + + "城市:" + saleLeads.getCity() + "\n\n" + + "工作职能:" + saleLeads.getWork() + "" + saleLeads.getOtherWork() + "\n\n" + + "手机:" + saleLeads.getMobile() + "\n\n" + + "邮箱:" + saleLeads.getEmail() + "\n\n" + + "公司名称:" + saleLeads.getCompany() + "\n\n" + + "行业性质:" + saleLeads.getIndustryNature() + "\n\n" + + "线索来源:房价网" ; + try { + JSONObject requestBody = new JSONObject(); + requestBody.put("msgtype", "markdown"); + JSONObject markdown = new JSONObject(); + markdown.put("title", "销售线索"); + markdown.put("text", body); + requestBody.put("markdown", markdown); + HttpRequest request = new HttpRequest(); + final String ding_url = "https://oapi.dingtalk.com/robot/send?access_token=894650a12af9497bed599df1d5f93b21d6da5bbae45f35f18c5825580ebbdf64"; + Map headers = new HashMap(); + headers.put("Content-Type", "application/json; charset=utf-8"); + request.postWithBody(ding_url, requestBody, headers, "UTF-8"); + } catch (HttpRequestException e) { + e.printStackTrace(); + } saleLeadsService.save(saleLeads); - + if(StringUtils.isNotBlank(saleLeads.getBusiness()) && saleLeads.getBusiness().contains("_")){ String[] businessArray = saleLeads.getBusiness().split("_"); for(String s : businessArray){ diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl index c8c45e7cc..aab69abc0 100644 --- a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl @@ -555,27 +555,53 @@ $(".user_btn").click(function(){ scrollTo(0,0); return false; } - + + // 瑙e喅淇℃伅涓㈠け闂 + var work = $(".duty:visible").find("select").val() + if (work) { + work = work.replaceAll("璇烽�夋嫨鎮ㄧ殑宸ヤ綔鑱岃兘", "") + work = work.replaceAll("璇烽�夋嫨", "") + $("#work").val(work); + } + + var box = $(".demand p i.checked"); + if(box.length>0) { + $(".demand").parent().find(".error span").text("") + $(".demand").parent().find(".error").hide(); + var selectOtherFlag = false; + var content = [] + box.each(function () { + var s = $(this).parent().find("span").text(); + if (s.indexOf("璇峰~鍐�") > 0) { + selectOtherFlag = true; + } else { + content.push(s); + } + }) + $("#business").val(content.join("_")); + } + + /*if(!checkEmail()){ scrollBy(0,-300); return false; } - - if(!checkNature()){ - scrollBy(0,-200); - return false; - } if(!checkWork()){ scrollBy(0,-100); return false; } - + + if(!checkNature()){ + scrollBy(0,-200); + return false; + } if(mid=="1018"||mid=="1016"){ if(!checkOtherInfo()){ scrollBy(0,-100); return false; } - } */ + } + */ var cls = $(".agreement i").attr("class"); if(cls.indexOf("checked")>-1){ From 49741ff80df4ff36e51d9fed353165949be49504 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 21 Jun 2022 11:52:05 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=AE=98=E7=BD=91=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=94=BE=E5=BC=80=E7=88=AC=E8=99=AB=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/coresite/filters/AntiSpiderFilter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java index b33d38545..d14d5661a 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/filters/AntiSpiderFilter.java @@ -48,6 +48,11 @@ public class AntiSpiderFilter implements Filter { HttpServletRequest request = (HttpServletRequest) req; HttpServletResponse response = (HttpServletResponse) resp; + // 放开首页不做爬虫验证 + if (request.getRequestURL().toString().endsWith("fangjia.com")) { + chain.doFilter(req, resp); + return; + } if(request.getRequestURI().endsWith("/validate") || request.getRequestURI().contains("randomCode") || request.getRequestURI().contains("checkCode")|| request.getRequestURI().contains("yeepayCallBack")){ chain.doFilter(req, resp); return; From dfe12163bd165198c4daf7a7eb7467cb3bb840e6 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 21 Jun 2022 14:04:49 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BE=E5=BA=A6?= =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=9B=9E=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/SolutionController.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java index ef220df7d..dfc288402 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java @@ -1,6 +1,15 @@ package com.fangjia.coresite.controllers; +import com.fangjia.core.util.HttpRequest; +import com.fangjia.core.util.HttpRequestException; import com.fangjia.coresite.model.FangjiaModel; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; /** * 解决方案 控制器 @@ -14,7 +23,32 @@ public class SolutionController { * @param model * @return */ - public Object apiAction(FangjiaModel model) { + public Object apiAction(FangjiaModel model, HttpServletRequest request) { + // 对于百度广告过来的信息,进行回传 + try { + String queryString = request.getQueryString(); + if (StringUtils.isNotBlank(queryString) && queryString.contains("bd_vid")) { + HttpRequest httpRequest = new HttpRequest(); + final String baiduUrl = "https://ocpc.baidu.com/ocpcapi/api/uploadConvertData"; + Map headers = new HashMap(); + headers.put("Content-Type", "application/json; charset=utf-8"); + + JSONObject requestBody = new JSONObject(); + // https://fengchao.baidu.com/fc/toolscenter/optimize/track/user/27002539 + requestBody.put("token", "EZGISwlOClRMEZErT2ThZTEjpLAzs2wE@9POwrGLqpRtQeGhvvCug1N3OK1tq3skk"); + JSONArray jsonArray = new JSONArray(); + JSONObject contentJson = new JSONObject(); + contentJson.put("logidUrl", request.getRequestURL().append("?" + request.getQueryString()).toString()); + contentJson.put("newType", "1"); + jsonArray.add(contentJson); + requestBody.put("conversionTypes", jsonArray); + String result = httpRequest.postWithBody(baiduUrl, requestBody, headers, "UTF-8"); + System.out.println(result); + } + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return model; } From 386decec78507156cac2882ddc0b1c0a5586b7b6 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 21 Jun 2022 15:08:22 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=9E=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/SaleLeadsController.java | 36 +++++++++++++++++-- .../controllers/SolutionController.java | 25 ------------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index a42c95280..d2bebc084 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -18,6 +18,7 @@ import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.DingDingMessageUtil; import com.fangjia.core.util.HttpRequest; import com.fangjia.core.util.HttpRequestException; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -34,9 +35,12 @@ import com.fangjia.service.common.CookieName; import com.fangjia.service.fangjia.NewsResourceService; import com.fangjia.service.fangjia.SaleLeadsService; import com.fangjia.service.mongo.fangjia.ServerAreaService; +import org.apache.log4j.Logger; public class SaleLeadsController { + private static final Logger LOG = Logger.getLogger(SaleLeadsController.class); + private SaleLeadsService saleLeadsService; private ServerAreaService serverAreaService; private NewsResourceService newsResourceService; @@ -144,8 +148,12 @@ public class SaleLeadsController { + "手机:" + saleLeads.getMobile() + "\n\n" + "邮箱:" + saleLeads.getEmail() + "\n\n" + "公司名称:" + saleLeads.getCompany() + "\n\n" - + "行业性质:" + saleLeads.getIndustryNature() + "\n\n" - + "线索来源:房价网" ; + + "行业性质:" + saleLeads.getIndustryNature() + "\n\n"; + if (org.apache.commons.lang3.StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + body += "线索来源:百度"; + } else { + body += "线索来源:房价网"; + } try { JSONObject requestBody = new JSONObject(); requestBody.put("msgtype", "markdown"); @@ -163,6 +171,30 @@ public class SaleLeadsController { } saleLeadsService.save(saleLeads); + // 对于百度广告过来的信息,进行回传 + try { + if (org.apache.commons.lang3.StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + HttpRequest httpRequest = new HttpRequest(); + final String baiduUrl = "https://ocpc.baidu.com/ocpcapi/api/uploadConvertData"; + Map bdHeaders = new HashMap(); + bdHeaders.put("Content-Type", "application/json; charset=utf-8"); + + JSONObject requestBody = new JSONObject(); + // https://fengchao.baidu.com/fc/toolscenter/optimize/track/user/27002539 + requestBody.put("token", "EZGISwlOClRMEZErT2ThZTEjpLAzs2wE@9POwrGLqpRtQeGhvvCug1N3OK1tq3skk"); + JSONArray jsonArray = new JSONArray(); + JSONObject contentJson = new JSONObject(); + contentJson.put("logidUrl", refUrl); + contentJson.put("newType", "3"); + jsonArray.add(contentJson); + requestBody.put("conversionTypes", jsonArray); + String result = httpRequest.postWithBody(baiduUrl, requestBody, bdHeaders, "UTF-8"); + LOG.info("百度回传成功:" + result); + } + } catch (HttpRequestException e) { + e.printStackTrace(); + } + if(StringUtils.isNotBlank(saleLeads.getBusiness()) && saleLeads.getBusiness().contains("_")){ String[] businessArray = saleLeads.getBusiness().split("_"); for(String s : businessArray){ diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java index dfc288402..b49974a26 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java @@ -24,31 +24,6 @@ public class SolutionController { * @return */ public Object apiAction(FangjiaModel model, HttpServletRequest request) { - // 对于百度广告过来的信息,进行回传 - try { - String queryString = request.getQueryString(); - if (StringUtils.isNotBlank(queryString) && queryString.contains("bd_vid")) { - HttpRequest httpRequest = new HttpRequest(); - final String baiduUrl = "https://ocpc.baidu.com/ocpcapi/api/uploadConvertData"; - Map headers = new HashMap(); - headers.put("Content-Type", "application/json; charset=utf-8"); - - JSONObject requestBody = new JSONObject(); - // https://fengchao.baidu.com/fc/toolscenter/optimize/track/user/27002539 - requestBody.put("token", "EZGISwlOClRMEZErT2ThZTEjpLAzs2wE@9POwrGLqpRtQeGhvvCug1N3OK1tq3skk"); - JSONArray jsonArray = new JSONArray(); - JSONObject contentJson = new JSONObject(); - contentJson.put("logidUrl", request.getRequestURL().append("?" + request.getQueryString()).toString()); - contentJson.put("newType", "1"); - jsonArray.add(contentJson); - requestBody.put("conversionTypes", jsonArray); - String result = httpRequest.postWithBody(baiduUrl, requestBody, headers, "UTF-8"); - System.out.println(result); - } - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return model; } From 0a243ea265bf3a1f9e258c9a1ad4ba0c737aa115 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Tue, 21 Jun 2022 16:57:12 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=8F=AF=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=8B=A8=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coresite/controllers/SaleLeadsController.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index d2bebc084..8e3980d60 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -52,6 +52,15 @@ public class SaleLeadsController { return model; } + /** + * 地数公众号咨询 + * @param model + * @return + */ + public Object didataApplyAction(SaleLeadsModel model) { + return model; + } + public Object doAddAction(SaleLeadsModel model, HttpServletRequest req, HttpServletResponse res) throws UnsupportedEncodingException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { @@ -156,11 +165,11 @@ public class SaleLeadsController { } try { JSONObject requestBody = new JSONObject(); - requestBody.put("msgtype", "markdown"); + requestBody.put("msgtype", "text"); JSONObject markdown = new JSONObject(); markdown.put("title", "销售线索"); - markdown.put("text", body); - requestBody.put("markdown", markdown); + markdown.put("content", body); + requestBody.put("text", markdown); HttpRequest request = new HttpRequest(); final String ding_url = "https://oapi.dingtalk.com/robot/send?access_token=894650a12af9497bed599df1d5f93b21d6da5bbae45f35f18c5825580ebbdf64"; Map headers = new HashMap(); From 7c67d5f6a220f01d29baa85f2fcc06081a8a6125 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 22 Jun 2022 09:10:29 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E5=AF=BC=E5=BB=BA=E8=A1=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8C=BA=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccbevaluation/ExportOracleData.groovy | 288 +++++++++++------- .../ccbevaluation/GuiDingPriceBatch.groovy | 2 +- .../fangjia/script/ccbevaluation/Test.groovy | 1 + .../ccbevaluation/data/CcbDistrictToDB.groovy | 77 +++-- .../script/gj/paimai/PaimaiTest.groovy | 26 +- 5 files changed, 266 insertions(+), 128 deletions(-) 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 af8723b42..eaf7586a5 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 @@ -23,7 +23,7 @@ class ExportOracleData { def run() { // def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - + def new_dists = ["350604","350605","410307","410308","450181"] //不会变 exportEvaluationRateData() exportBigdataPoiData() @@ -37,9 +37,9 @@ class ExportOracleData { exportCommunityStaging() exportCommunityBuileType() - exportThirdPartyPrice2(lastMonth) - exportBigdataForsale("2022-04-19") - exportBigdataDeal("2022-04-01") + exportThirdPartyPrice2(lastMonth, new_dists) + exportBigdataForsale("2022-05-19", new_dists) + exportBigdataDeal("2022-05-01", new_dists) //计算结果相关 @@ -293,12 +293,51 @@ class ExportOracleData { println "COMMUNITY_GUIDE_PRICE_GJ 上传Ftp完成......" } - def exportBigdataDeal(def dealDate) { - def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + - "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + - "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + - "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + - "from bigdata_deal_gj where dealdate>=to_date('${dealDate}','yyyy-MM-dd')"; + def exportBigdataDeal(def dealDate, def new_dists) { + + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + + "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + + "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + + "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + + "from bigdata_deal_gj where dealdate>=to_date('${dealDate}','yyyy-MM-dd') and distid not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + + "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + + "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + + "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + + "from bigdata_deal_gj where distid in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + + "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + + "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + + "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + + "from bigdata_deal_gj where dealdate>=to_date('${dealDate}','yyyy-MM-dd')"; + allRows = dealData(sql) + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] +//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_DEAL_GJ 数据文件输出完成......" + CcbFtpUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_DEAL_GJ 上传Ftp完成......" + } + + + def dealData(def sql){ def allRows = [] sqlInstance.eachRow(sql, { r -> def data = [] @@ -369,21 +408,9 @@ class ExportOracleData { data << r.WORKDATE allRows << data }); - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" - if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" - } - def headers = [] -//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] - - FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_DEAL_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) - println "BIGDATA_DEAL_GJ 上传Ftp完成......" + return allRows } - def exportThirdPartyPrice() { def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, ZHUGE_AVG_PRICE, ANJUKE_AVG_PRICE, FANG_AVG_PRICE, LIANJIA_AVG_PRICE, CITYHOUSE_AVG_PRICE, MAITIAN_AVG_PRICE, KE_AVG_PRICE, \n" + "TAOFANG_AVG_PRICE, ZHONGYUAN_AVG_PRICE, TBS_AVG_PRICE, QFANG_AVG_PRICE, FANGTAN_AVG_PRICE, FANGDUODUO_AVG_PRICE, WIWJ_AVG_PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE\n" + @@ -433,8 +460,42 @@ class ExportOracleData { } - def exportThirdPartyPrice2(price_date) { - def sql = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where price_date=${price_date} "; + def exportThirdPartyPrice2(price_date, new_dists) { + + def allRows = [] + if(new_dists) { + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " + + "COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " + + "price_date=${price_date} and distid not in ${newstr} "; + def rets1 = getThirdPartyDatas(sql1) + allRows.addAll(rets1) + + def sql2 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " + + "COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " + + "distid in ${newstr} "; + def rets2 = getThirdPartyDatas(sql2) + allRows.addAll(rets2) + }else{ + def sql = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where price_date=${price_date} "; + allRows = getThirdPartyDatas(sql) + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" +// fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] +//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","均价对应的月份","诸葛找房均价","安居客均价","房天下均价","链家均价","城市房产均价","麦田均价","贝壳均价","淘房365","中原均价","兔博士均价","Q房均价","房探均价","房多多均价","我爱我家均价","创建时间","更新时间","来源公司"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" + CcbFtpUtils.ftpUpload(null, fileName, curDate) + } + + def getThirdPartyDatas(def sql){ def allRows = [] sqlInstance.eachRow(sql, { r -> def data = [] @@ -452,21 +513,9 @@ class ExportOracleData { data << r.UPDATETIME allRows << data }) - def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; - def fileName = "/ccb/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" - if (CommonDatautils.isWindow()) { - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" -// fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" - } - def headers = [] -//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","均价对应的月份","诸葛找房均价","安居客均价","房天下均价","链家均价","城市房产均价","麦田均价","贝壳均价","淘房365","中原均价","兔博士均价","Q房均价","房探均价","房多多均价","我爱我家均价","创建时间","更新时间","来源公司"] - - FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......" - CcbFtpUtils.ftpUpload(null, fileName, curDate) + return allRows; } - def exportBigdataCommunity(){ def sql = "select CITYID, DISTID, COMMID, DISTNAME, COMMNAME, ADDRESS, LATITUDE, LONGITUDE, LANDAREA, BUILDAREA, GREENINGRATE, PLOTRATIO, PARKINGCNT, BUILDYEAR, HOUSEUSE, ZTS, WORKDATE, UPDATEFLAG, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE, \n" + "\tCOMMALIAS, STREET, STREETNO, IFNEW, INTRODUCTION, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, SOURCECODE, XZJDB, LJXZQHDM, LJXZQH,STATUS from bigdata_community_gj ";//where cityId in (350200,150100) @@ -521,7 +570,7 @@ class ExportOracleData { println "BIGDATA_COMMUNITY_GJ 上传Ftp完成......" } - def exportBigdataForsale(publishDate){ + def exportBigdataForsale(publishDate, new_dists){ //["北京","上海"] def citys = CcbCommonUtils.citys; def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() @@ -535,84 +584,111 @@ class ExportOracleData { for(def city : citys){ def cityCode = cityCodeDataMap.get(city) - def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + - " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + - " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd')"; - def allRows = [] - def index = 0 - sqlInstance.eachRow(sql,{r-> - index = index+1 - println city +" "+index - def data = [] - data << r.CITYID - data << r.FORSALEID - data << r.PROPCODE - data << r.CITYNAME - data << r.DISTID - data << r.DISTNAME - data << r.COMMID - data << r.COMMNAME - data << r.BUILDID - data << r.BUILDNO - data << r.BUILDNAME - data << r.UNITID - data << r.UNITNO - data << r.UNITNAME - data << r.HOUSEID - data << r.ADDRESS - data << r.BUILDYEAR - data << r.PROPTYPE - data << r.PROPYEARS - data << r.UNITPRICE - data << r.TOTALPRICE - data << r.PAYTYPE - data << r.FLOORNUM - data << r.FLOORCNT - data << r.BUILDTYPE - data << r.HOUSESTRU - data << r.BUILDSTRU - data << r.BUILDAREA - data << r.LIVINGAREA - data << r.HOUSESTYLE - data << r.ROOMCNT - data << r.LIVINGROOMCNT - data << r.KITCHENCNT - data << r.BATHROOMCNT - data << r.HOUSEASPECT - data << r.FITMENT - data << r.IFELEVATOR - data << r.ELEVATORHOUSE - data << r.PUBLISHTIME - data << r.EXPIRETIME - data << r.IFFIRST - data << r.DATASOURCE - data << r.AGENCYID - data << r.AGENCYNAME - data << r.PUBLISHER - data << r.PHONE - data << "" - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - data << r.ATTACH - allRows << data - if(allRows.size()%200000==0){ - FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); - allRows.clear() - } - }); + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj " + + "where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd') and distid not in ${newstr}"; + def rets1 = getHouseDatas(sql1) + allRows.addAll(rets1) + }else{ + def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd')"; + allRows = getHouseDatas(sql) + } if(allRows.size()>0){ FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); } + } + if(new_dists){//补充被修区域的数据 + def newstr = "('"+new_dists.join("','")+"')" + def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH " + + "from bigdata_forsale_gj where distid in ${newstr}" + def rets2 = getHouseDatas(sql2) + if(rets2.size()>0){ + FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); + } } println "BIGDATA_FORSALE_GJ 数据文件输出完成......" CcbFtpUtils.ftpUpload(null, fileName, curDate) println "BIGDATA_FORSALE_GJ 上传Ftp完成......" } + def getHouseDatas(sql){ + def allRows = [] + def index = 0 + sqlInstance.eachRow(sql,{r-> + index = index+1 + println r.CITYNAME +" "+index + def data = [] + data << r.CITYID + data << r.FORSALEID + data << r.PROPCODE + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.UNITPRICE + data << r.TOTALPRICE + data << r.PAYTYPE + data << r.FLOORNUM + data << r.FLOORCNT + data << r.BUILDTYPE + data << r.HOUSESTRU + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEASPECT + data << r.FITMENT + data << r.IFELEVATOR + data << r.ELEVATORHOUSE + data << r.PUBLISHTIME + data << r.EXPIRETIME + data << r.IFFIRST + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.PUBLISHER + data << r.PHONE + data << "" + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.ATTACH + allRows << data +// if(allRows.size()%200000==0){ +// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); +// allRows.clear() +// } + }); + return allRows + } + def exportAvmEvaluationGJNB(yearMonth){ def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" + 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 2476de4c3..045cd0a82 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, "2022-04-1", "2022-05-1") + def prices = CcbCommonUtils.findPersonPrice(city, "2022-05-1", "2022-06-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 5648796e8..72bc95878 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 @@ -334,6 +334,7 @@ ExcelUtils.modify("D:\\ if(dist){ def udata = new BasicDBObject() udata.put("name_cat", 11) + udata.put("status", 1) udata.put("m_date",new Date()) def q = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy index 85e2c71b4..2ee14adc4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDistrictToDB.groovy @@ -31,8 +31,8 @@ class CcbDistrictToDB { // task.meituanSqrentRun() // task.updateDistrict() // task.updateDongguangRegion() -// task.houseDistToDB() - task.sendCalPrice() + task.houseDistToDB() +// task.sendCalPrice() } def sendCalPrice(){ @@ -97,11 +97,11 @@ class CcbDistrictToDB { def index = 0 def addIndex = 0 def keys = new CopyOnWriteArrayList() - ExcelUtils.modify("D:\\数据\\建行\\二期\\新增小区_2739_0610.xlsx", { d -> + ExcelUtils.modify("D:\\数据\\建行\\二期\\新增小区_2155.xlsx", { d -> index++ - if(d['I']){ + if(d['A']){ def city = d['A'] - def mapInfo = getStreetInfo(d['P']+","+d['Q']) + def mapInfo = getStreetInfo(d['L']+","+d['M']) def newRegion = null if(mapInfo){ if(d['A']=="东莞"){ @@ -114,15 +114,13 @@ class CcbDistrictToDB { newRegion = RegionData.formatRegion(city, newRegion) if(newRegion && newRegion.contains(d['B'])){ - def name = nameFileter(d['I']) + def name = nameFileter(d['E']) def alias = [] - if(d['I']!=name){ - alias << d['I'] - } - if(d['C']!=d['I'] && !alias.contains(d['C'])){ + if(d['C']!=name){ alias << d['C'] } + def estateType2 = "普通住宅" if(name){ if(name.contains("别墅")){ @@ -130,7 +128,7 @@ class CcbDistrictToDB { }else if(name.contains("商住")){ estateType2 = "商住" }else{ - def type = d['O'] + def type = d['K'] if(type){ if(type.contains("别墅")){ estateType2 = "别墅" @@ -141,8 +139,8 @@ class CcbDistrictToDB { } } def formatAddress = null - if (d['N']) { - formatAddress = AddressUtil.formatAddress(d['A'], d['N']) + if (d['J']) { + formatAddress = AddressUtil.formatAddress(d['A'], d['J']) } Long glat = null @@ -150,10 +148,10 @@ class CcbDistrictToDB { Long blat = null Long blng = null - if (d['P']) { - glat = d['P'].toString().toDouble() * 10000000000L - glng = d['Q'].toString().toDouble() * 10000000000L - def baidu = BaiDuApiUtils.geoconv(d['P'].toString().toDouble(), d['Q'].toString().toDouble(), 3) + if (d['M']) { + glat = d['M'].toString().toDouble() * 10000000000L + glng = d['L'].toString().toDouble() * 10000000000L + def baidu = BaiDuApiUtils.geoconv(d['L'].toString().toDouble(), d['M'].toString().toDouble(), 3) blng = baidu.x * 10000000000L blat = baidu.y * 10000000000L } @@ -175,6 +173,9 @@ class CcbDistrictToDB { data.put("name", name) data.put("estate_type2", estateType2) data.put("address", formatAddress) + if(alias){ + data.put("alias", alias) + } if (glat) { data.put("lat", glat) data.put("lng", glng) @@ -196,11 +197,47 @@ class CcbDistrictToDB { // } }else{ if(alias){ - def data = new BasicDBObject(); - data.put("alias", alias) - DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',data)) + def dbAlias = dist.alias + if(!dbAlias){ + def data = new BasicDBObject(); + data.put("alias", alias) + DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',data)) + }else{ + for(def n : alias){ + if(!dbAlias.contains(n)){ + dbAlias << n + } + } + + def data = new BasicDBObject(); + data.put("alias", dbAlias) + DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',data)) + } } } + }else{ + if(alias){ + def dist = CommonDatautils.findDistrict(city, newRegion, name, "district") + if (dist) { + def dbAlias = dist.alias + if(!dbAlias){ + def data = new BasicDBObject(); + data.put("alias", alias) + DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',data)) + }else{ + for(def n : alias){ + if(!dbAlias.contains(n)){ + dbAlias << n + } + } + + def data = new BasicDBObject(); + data.put("alias", dbAlias) + DbUtils.seaweed.update(new BasicDBObject('_id',dist._id),new BasicDBObject('$set',data)) + } + } + } + } }else{ println d['A']+" "+d['B']+" "+d['C'] +" 经纬度所在区:"+newRegion diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy index 6a50bd201..006b8a875 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/PaimaiTest.groovy @@ -30,8 +30,32 @@ class PaimaiTest { def task = new PaimaiTest(); // task.run(); // task.stat() - task.updatePaimai() +// task.updatePaimai() // task.updateFieldPaimai() + task.statCity() + } + + def statCity(){ + def q = new BasicDBObject() + def keys = new BasicDBObject() + keys.put("city", 1) + def dbcursor = paimai43_COLL.find(q, keys).batchSize(5000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + def set = new HashSet() + def index = 0 + for(def d : dbcursor){ + index++ + if(index%10000==0){ + print "." + } + if(!set.contains(d.city)){ + set << d.city + } + } + + println set.size() + for(def s : set){ + println s + } } def updateFieldPaimai(){ From 806939a4a3a3faa00e76be4584731588c0fa2819 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 22 Jun 2022 10:55:38 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E6=95=B0?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/SaleLeadsController.java | 24 +- .../src/main/resources/urlrewrite2.0.xml | 12 +- .../src/main/webapp/saleLeads/didataApply.ftl | 474 ++++++++++++++++++ .../main/webapp/saleLeads/didataResult.ftl | 87 ++++ .../mongo/fangjia/enums/SalesLeadEnum.java | 3 +- 5 files changed, 592 insertions(+), 8 deletions(-) create mode 100644 projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl create mode 100644 projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 8e3980d60..eab5dbd3c 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -153,13 +153,16 @@ public class SaleLeadsController { "业务需求:" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" + "姓名:" + saleLeads.getUname() + "\n\n" + "城市:" + saleLeads.getCity() + "\n\n" - + "工作职能:" + saleLeads.getWork() + "" + saleLeads.getOtherWork() + "\n\n" + + "工作职能:" + saleLeads.getWork() + " " + saleLeads.getOtherWork() + "\n\n" + "手机:" + saleLeads.getMobile() + "\n\n" + "邮箱:" + saleLeads.getEmail() + "\n\n" + "公司名称:" + saleLeads.getCompany() + "\n\n" - + "行业性质:" + saleLeads.getIndustryNature() + "\n\n"; - if (org.apache.commons.lang3.StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + + "行业性质:" + saleLeads.getIndustryNature() + " " + saleLeads.getOtherIndustryNature() + "\n\n"; + body = body.replaceAll("null", "").replaceAll("其他,请填写", ""); + if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { body += "线索来源:百度"; + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { + body += "线索来源: 地数公众号"; } else { body += "线索来源:房价网"; } @@ -175,14 +178,14 @@ public class SaleLeadsController { Map headers = new HashMap(); headers.put("Content-Type", "application/json; charset=utf-8"); request.postWithBody(ding_url, requestBody, headers, "UTF-8"); - } catch (HttpRequestException e) { + } catch (Exception e) { e.printStackTrace(); } saleLeadsService.save(saleLeads); // 对于百度广告过来的信息,进行回传 try { - if (org.apache.commons.lang3.StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { HttpRequest httpRequest = new HttpRequest(); final String baiduUrl = "https://ocpc.baidu.com/ocpcapi/api/uploadConvertData"; Map bdHeaders = new HashMap(); @@ -228,7 +231,12 @@ public class SaleLeadsController { if(StringUtils.isNotBlank(refUrl) && refUrl.contains("/resource/info")){ url = refUrl.substring(refUrl.indexOf("/resource/info"), refUrl.length()); - }else{ + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // 地数公众号跳转 + url = "/enquire/didataSuccess"; + if (StringUtils.isNotBlank(refUrl)) { + url = url + "?backUrl=" + URLEncoder.encode(refUrl); + } + } else{ url = "/enquire/success"; if (StringUtils.isNotBlank(refUrl)) { url = url + "?backUrl=" + URLEncoder.encode(refUrl); @@ -297,6 +305,10 @@ public class SaleLeadsController { return model; } + public Object didataResultAction(SaleLeadsModel model) { + return model; + } + public SaleLeadsService getSaleLeadsService() { return saleLeadsService; } diff --git a/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml index 5c8ab82c9..d96ca92fe 100644 --- a/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml @@ -309,7 +309,17 @@ / - + + + + /didataApply + + + + + /didataSuccess + + diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl new file mode 100644 index 000000000..78f147355 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl @@ -0,0 +1,474 @@ + + + + + +鏃剁┖浠峰�兼寲鎺樺钩鍙� -鍦版暟 didata.ai + + +<#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + + + +<#escape x as x?html> +
+
+ +
+
+ +
+
+
+
+

+

鎴戜滑寰堜箰鎰忎负鎮ㄦ彁渚涘府鍔�
+ √ 璇﹀敖鐨勪骇鍝佸姛鑳藉強鏈嶅姟浠嬬粛
+ √ 閽堝鎮ㄦ墍澶勭殑琛屼笟涓庝笟鍔″満鏅紝鎻愪緵涓撲笟鐨勬湇鍔℃柟妗�
+ √ 鏍规嵁鎮ㄧ殑涓氬姟瑙勬ā鍜岄渶姹傦紝鎻愪緵浼樻儬鐨勪环鏍兼柟妗�
+ 绱ф�ュ挩璇㈠彲鎷ㄦ墦400-188-3787
+ 棰勭害鐢宠璇风暀涓嬫偍鐨勮仈绯绘柟寮忥紝鎴戜滑浼氬敖蹇笌鎮ㄨ仈绯�
+
+

+
+
+
+ + + + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ 鎻愪氦 +
+
+
+ + +<#include "/header/v5/_footer.ftl" /> +<#include "../citys.ftl"/> + + + + + + + + + + + + + + + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl new file mode 100644 index 000000000..2009d5282 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl @@ -0,0 +1,87 @@ + + + + + +鍜ㄨ淇℃伅鎻愪氦鎴愬姛 - 鍦版暟 didata.ai + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+
+

鎮ㄧ殑淇℃伅宸叉彁浜ゆ垚鍔�

+ +

鑻ユ偍鏈変换浣曢棶棰橈紝娆㈣繋鎷ㄦ墦瀹㈡湇鐢佃瘽锛�400-188-3787

+
+
+
+
+ +<#include "/header/v5/_footer.ftl"/> + + + + + + + + diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java index 8daca61ed..6cb65c498 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java @@ -22,7 +22,8 @@ public enum SalesLeadEnum { DOWN_APPLY("1016", "下载申请"), FDANG_DIAO_BAO_GAO("1017", "房产专业调查评估报告"), BUSINESS_ASK("1018", "业务咨询"), - HOUSE_EVAL("1019", "房产评估"); + HOUSE_EVAL("1019", "房产评估"), + DIDATA("1020", "地数平台"); From 134a76cd767956c20cbb311e4ae18a49043dd3b2 Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 22 Jun 2022 11:12:03 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/webapp/saleLeads/didataApply.ftl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl index 78f147355..05f42d047 100644 --- a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl @@ -5,7 +5,7 @@ 鏃剁┖浠峰�兼寲鎺樺钩鍙� -鍦版暟 didata.ai - + <#include "../jsconstants.ftl" /> @@ -89,14 +89,12 @@

-

鎴戜滑寰堜箰鎰忎负鎮ㄦ彁渚涘府鍔�
- √ 璇﹀敖鐨勪骇鍝佸姛鑳藉強鏈嶅姟浠嬬粛
- √ 閽堝鎮ㄦ墍澶勭殑琛屼笟涓庝笟鍔″満鏅紝鎻愪緵涓撲笟鐨勬湇鍔℃柟妗�
- √ 鏍规嵁鎮ㄧ殑涓氬姟瑙勬ā鍜岄渶姹傦紝鎻愪緵浼樻儬鐨勪环鏍兼柟妗�
- 绱ф�ュ挩璇㈠彲鎷ㄦ墦400-188-3787
- 棰勭害鐢宠璇风暀涓嬫偍鐨勮仈绯绘柟寮忥紝鎴戜滑浼氬敖蹇笌鎮ㄨ仈绯�
-
-

+
鎴戜滑寰堜箰鎰忎负鎮ㄦ彁渚涘府鍔�
+
√ 璇﹀敖鐨勪骇鍝佸姛鑳藉強鏈嶅姟浠嬬粛
+
√ 閽堝鎮ㄦ墍澶勭殑琛屼笟涓庝笟鍔″満鏅紝鎻愪緵涓撲笟鐨勬湇鍔℃柟妗�
+
√ 鏍规嵁鎮ㄧ殑涓氬姟瑙勬ā鍜岄渶姹傦紝鎻愪緵浼樻儬鐨勪环鏍兼柟妗�
+
绱ф�ュ挩璇㈠彲鎷ㄦ墦400-188-3787
+
棰勭害鐢宠璇风暀涓嬫偍鐨勮仈绯绘柟寮忥紝鎴戜滑浼氬敖蹇笌鎮ㄨ仈绯�
@@ -131,7 +129,7 @@
- 鎻愪氦 + 鎻愪氦 From d57fa29702a4827abf72e4444b6e5c28509a547c Mon Sep 17 00:00:00 2001 From: Jian Shen Date: Wed, 22 Jun 2022 13:29:26 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E5=89=94=E9=99=A4=E9=A1=B5=E8=84=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl | 1 - .../fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl index 05f42d047..07a832de8 100644 --- a/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl @@ -135,7 +135,6 @@ -<#include "/header/v5/_footer.ftl" /> <#include "../citys.ftl"/>