diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl
index 9ade46e39..ac49fc289 100644
--- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl
+++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl
@@ -724,19 +724,59 @@
});
var series = new Array();
series[0] = {
- name:"房�散列图",
+ name:"房�散列图-普通�宅",
data:new Array()
//color:"#660099"
}
+ series[1] = {
+ name:"房�散列图-商�",
+ data:new Array(),
+ color:"#12990f"
+ }
+ series[2] = {
+ name:"房�散列图-别墅",
+ data:new Array(),
+ color:"#992632"
+ }
+ var series_arry_0 = []
+ var series_arry_1 = []
+ var series_arry_2 = []
$(data).each(function(i,item){
var pdate = item.pDate + "";
var ds = pdate.substring(0, 4) + '-' + pdate.substring(4, 6) + '-' + pdate.substring(6)
- series[0].data.push({
- x:new Date(ds),
- y:Math.round(item.totalPrice/item.area),
- data:item
- })
+ if (item.estateType.indexOf('别墅') > -1){
+ series_arry_2.push({
+ x:new Date(ds),
+ y:Math.round(item.totalPrice/item.area),
+ data:item
+ })
+ }else if((item.estateType.indexOf('商�') > -1) || (item.estateType.indexOf('公寓酒店') > -1)){
+ series_arry_1.push({
+ x:new Date(ds),
+ y:Math.round(item.totalPrice/item.area),
+ data:item
+ })
+ }else{
+ series_arry_0.push({
+ x:new Date(ds),
+ y:Math.round(item.totalPrice/item.area),
+ data:item
+ })
+ }
+ // series[0].data.push({
+ // x:new Date(ds),
+ // y:Math.round(item.totalPrice/item.area),
+ // data:item
+ // })
+ // series[1].data.push({
+ // x:new Date(ds),
+ // y:Math.round(item.totalPrice/item.area),
+ // data:item
+ // })
});
+ series[0].data = series_arry_0
+ series[1].data = series_arry_1
+ series[2].data = series_arry_2
$('#houseChart').highcharts({
chart: {
type: 'scatter',
diff --git a/projects/fangjia-bkoff/src/main/webapp/loudong/list.ftl b/projects/fangjia-bkoff/src/main/webapp/loudong/list.ftl
index f131f5e6e..ff6b813b2 100644
--- a/projects/fangjia-bkoff/src/main/webapp/loudong/list.ftl
+++ b/projects/fangjia-bkoff/src/main/webapp/loudong/list.ftl
@@ -152,7 +152,7 @@
<#list loudongList! as loudong>
- |
+ |
${loudong.districtNo!''}
|
diff --git a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
index 69d4cd0f7..af17b04e3 100644
--- a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
+++ b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
@@ -140,6 +140,7 @@
| �� |
装修 |
�� |
+ 物业类型 |
�� |
�作 |
@@ -180,6 +181,7 @@
${it.block!} |
${it.fitment!} |
${it.direction!} |
+ ${it.estateType!} |
<#if it.url??>
${t_util.urlToSiteName(it.url!)!'未知'}
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..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
@@ -6,12 +6,20 @@ 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.JSONArray;
+import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import com.fangjia.coresite.model.JsonModel;
@@ -27,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;
@@ -41,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 {
@@ -129,8 +149,64 @@ 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() + " " + 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 += "ÏßË÷À´Ô´£º·¿¼ÛÍø";
+ }
+ try {
+ JSONObject requestBody = new JSONObject();
+ requestBody.put("msgtype", "text");
+ JSONObject markdown = new JSONObject();
+ markdown.put("title", "ÏúÊÛÏßË÷");
+ 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();
+ headers.put("Content-Type", "application/json; charset=utf-8");
+ request.postWithBody(ding_url, requestBody, headers, "UTF-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
saleLeadsService.save(saleLeads);
-
+
+ // ¶ÔÓÚ°Ù¶È¹ã¸æ¹ýÀ´µÄÐÅÏ¢£¬½øÐлش«
+ try {
+ 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();
+ 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){
@@ -155,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);
@@ -224,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/java/com/fangjia/coresite/controllers/SolutionController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java
index ef220df7d..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
@@ -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,7 @@ public class SolutionController {
* @param model
* @return
*/
- public Object apiAction(FangjiaModel model) {
+ public Object apiAction(FangjiaModel model, HttpServletRequest request) {
return model;
}
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;
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/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl
index 16b30ed80..5e222e0da 100644
--- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl
@@ -153,46 +153,47 @@
他们都在和我们�作
-
-
-
-<#-- -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 
+<#-- -->
+<#-- -->
+<#-- -->
+<#--<#– –>-->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
+<#-- -->
- 
+
diff --git a/projects/fangjia-coresite/src/main/webapp/index.ftl b/projects/fangjia-coresite/src/main/webapp/index.ftl
index b5cb130e7..efec6e4b6 100644
--- a/projects/fangjia-coresite/src/main/webapp/index.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/index.ftl
@@ -207,29 +207,29 @@
-
-
- 
-
-
-
+<#---->
+<#-- -->
+<#-- 
-->
+<#-- -->
+<#-- -->
+<#-- -->
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;
}
-
+
+ // 解决信�丢失问题
+ 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){
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..07a832de8
--- /dev/null
+++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataApply.ftl
@@ -0,0 +1,471 @@
+
+
+
+
+
+时空价值挖掘平� -地数 didata.ai
+
+
+<#include "../jsconstants.ftl" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<#escape x as x?html>
+
+
+
+
+
+
+
+ 我们很��为您�供帮助
+ √ 详尽的产å“�功能å�Šæœ�务介ç»�
+ √ 针对您所处的行业与业务场景,æ��供专业的æœ�务方案
+ √ æ ¹æ�®æ‚¨çš„业务规模和需求,æ��ä¾›ä¼˜æƒ çš„ä»·æ ¼æ–¹æ¡ˆ
+ 紧急咨询�拨打400-188-3787
+ 预约申请请留下您的�系方�,我们会尽快与您�系
+
+
+ �交
+
+
+
+
+
+<#include "../citys.ftl"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#escape>
+
+
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..d81912435
--- /dev/null
+++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/didataResult.ftl
@@ -0,0 +1,86 @@
+
+
+
+
+
+咨询信��交�功 - 地数 didata.ai
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 您的信�已�交�功
+ 我们的专业数�顾问将会尽快与您�得�系,感谢您的咨询�
+ 若您有任何问题,欢迎拨打客�电�:400-188-3787
+
+
+
+
+
+
+
+
+
+
+
+
+
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", "µØÊýƽ̨");
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 b59fe435b..1000b157c 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
@@ -41,8 +41,15 @@ class BigdataCommbuildtypeBatch extends BaseBatch{
rets.addAll(rows)
println city +" "+rows.size()
}
+
+ def fileName = "/home/goojia/ccb/BIGDATA_COMMBUILDTYPE_GJ.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_COMMBUILDTYPE_GJ.dat"
+ }
+
+
def headers = []//["³ÇÊÐID","Ð¡ÇøID"," ½¨ÖþÀàÐÍ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","Êý¾Ýʱ¼ä"]
- FileUtils.batchCreateFile(rets, "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_COMMBUILDTYPE_GJ.dat",headers, "utf-8", false);
+ FileUtils.batchCreateFile(rets, fileName,headers, "utf-8", false);
println "txt Éú³É"
}
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/BigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy
index 0bc461cc5..724682101 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy
@@ -74,7 +74,7 @@ class BigdataForsaleBatch extends BaseBatch{
// def distIds = getDistrictIds(cityCodeDataMap.get(city))
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat","address", "alias", "finish_building_date", "house_property", "property_life", "build_type", "build_structure"]);
- exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20220418, 20220519);
+ exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20220518, 20220619);
// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20210801, 20210831);
//²âÊÔͨ¹ýÆ¥Åä½Ó¿ÚÅ䷿ԴЧ¹û
// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20201201, 20211118)
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/StagingDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy
index 532a96c43..3ac7f9a28 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy
@@ -34,6 +34,10 @@ class StagingDistrictBatch extends BaseBatch{
println city +" ·ÖÆÚÁ¿£º"+rets.size()
}
+ def fileName = "/home/goojia/ccb/COMMUNITY_STAGING_GJ.dat"
+ if(CommonDatautils.isWindow()){
+ fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\COMMUNITY_STAGING_GJ.dat"
+ }
def results =[]
def headers = []//["·ÖÆÚID","Ð¡ÇøID","Ð¡ÇøÖ÷ÆÚID","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"]
@@ -41,7 +45,7 @@ class StagingDistrictBatch extends BaseBatch{
results.addAll(rows)
//ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\excel\\COMMUNITY_STAGING_GJ.xlsx", results, "Êý¾Ý")
- FileUtils.batchCreateFile(rows, "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\COMMUNITY_STAGING_GJ.dat",headers, "utf-8", false);
+ FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false);
}
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/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/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/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy
index 830424944..e50059409 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
@@ -25,7 +25,7 @@ class ExportDistrictRongHe extends BaseBatch{
@Override
void process(Object args) {
def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
- def new_dists = ["350604","350605","410307","410308","450181"]
+ def new_dists = []//["350604","350605","410307","410308","450181"]
//°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£©
exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists)
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy
index 5abaef7c1..e374d233a 100644
--- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy
@@ -834,39 +834,42 @@ class CommonDatautils {
if(!id){
return null;
}
- DBObject q = new BasicDBObject();
- q.put("_id", new ObjectId(id.toString().replace("[","").replace("]","")));
-
- DBObject keys = new BasicDBObject();
- keys.put("alias", 1);
- keys.put("addr_alias", 1);
- keys.put("city", 1);
- keys.put("region", 1);
- keys.put("name", 1);
- keys.put("estate_type2", 1);
- keys.put("address", 1);
- keys.put("build_structure", 1);
- keys.put("out_pics", 1);
- keys.put("lat", 1);
- keys.put("lng", 1);
- keys.put("lat2", 1);
- keys.put("lng2", 1);
- keys.put("name_cat", 1);
- keys.put("finish_building_date", 1)
- keys.put("mapping_alias", 1)
- keys.put("sid", 1)
try{
- DSCursor cursor = getDataStoreConnection().find(q, keys);
- if(cursor){
- for(def obj : cursor){
- return obj;
+ DBObject q = new BasicDBObject();
+ q.put("_id", new ObjectId(id.toString().replace("[","").replace("]","")));
+
+ DBObject keys = new BasicDBObject();
+ keys.put("alias", 1);
+ keys.put("addr_alias", 1);
+ keys.put("city", 1);
+ keys.put("region", 1);
+ keys.put("name", 1);
+ keys.put("estate_type2", 1);
+ keys.put("address", 1);
+ keys.put("build_structure", 1);
+ keys.put("out_pics", 1);
+ keys.put("lat", 1);
+ keys.put("lng", 1);
+ keys.put("lat2", 1);
+ keys.put("lng2", 1);
+ keys.put("name_cat", 1);
+ keys.put("finish_building_date", 1)
+ keys.put("mapping_alias", 1)
+ keys.put("sid", 1)
+ try{
+ DSCursor cursor = getDataStoreConnection().find(q, keys);
+ if(cursor){
+ for(def obj : cursor){
+ return obj;
+ }
}
+ }catch(Exception e){
+ println "error_id:"+id
+ e.printStackTrace()
}
}catch(Exception e){
- println "error_id:"+id
- e.printStackTrace()
- }
+ }
return null;
}
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/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(){
diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/oracle/ExportExceptionPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/oracle/ExportExceptionPrice.groovy
new file mode 100644
index 000000000..ce6a0b94b
--- /dev/null
+++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/oracle/ExportExceptionPrice.groovy
@@ -0,0 +1,50 @@
+package com.fangjia.script.temp.shenjian.oracle;
+
+import com.fangjia.core.RegionData
+import com.fangjia.core.util.DistrictCodeUtils
+import com.fangjia.script.commData.CommonDatautils
+import com.fangjia.script.gj.district.FangjiaClientUtils
+import com.fangjia.script.lixue.util.DBUtils
+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.fangjia.script.util.MongoUtils
+import com.mongodb.BasicDBObject
+import com.mongodb.DBCollection
+import com.mongodb.DBObject
+import groovy.sql.Sql
+
+/**
+ * µ¼³öÒì³£¼Û¸ñ
+ */
+def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
+ "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
+
+def sql = "SELECT id, cityname, distname, commid, commname, calc_type, avg_price, year_month FROM community_base_price_gj WHERE year_month IN('202206', '202205') " +
+ " AND cityname IN ('¶«Ý¸', 'ÉϺ£') AND rownum <= 10 ORDER BY cityname, distname, commid, commname, year_month"
+def result = []
+result << ["³ÇÊÐ", "ÇøÓò", "Ð¡ÇøID", "Ð¡ÇøÃû", "ÎåÔ¾ù¼Û", "ÎåÔ¼ÆË㷽ʽ", "ÁùÔ¾ù¼Û", "ÁùÔ¼ÆË㷽ʽ"]
+Map fiveMap = new HashMap<>()
+Map sixMap = new HashMap<>()
+sqlInstance.eachRow(sql, { r ->
+ def year_month = r['year_month']
+ String key = r['cityname'] + "," + r['distname'] + "," + r['commid'] + "," + r['commname']
+ if (year_month == '202205') {
+ fiveMap.put(key, r['avg_price'] + "|" + r['calc_type'])
+ } else if ((year_month == '202206')) {
+ fiveMap.put(key, r['avg_price'] + "|" + r['calc_type'])
+ }
+})
+for (String key : sixMap.keySet()) {
+ Integer fivePrice = fiveMap.get(key).split("|")[0]
+ Integer sixPrice = sixMap.get(key).split("|")[0]
+ if (fivePrice != null && sixPrice != null) {
+ if (Math.abs(sixPrice - fivePrice) * 100 / fivePrice > 10) {
+ def info = key.split(",")
+ result << [info[0], info[1], info[2], info[3], fivePrice, fiveMap.get(key).split("|")[1], sixPrice, sixMap.get(key).split("|")[1]]
+ }
+ }
+}
+ExcelUtils.write("F:\\Êý¾Ý\\¼Û¸ñ\\¶«Ý¸ÉϺ£¼Û¸ñÆ«²î´ó.xlsx", result, "ͳ¼Æ")
\ No newline at end of file
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);
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 9b5bf7fda..22a2ab033 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
@@ -41,19 +41,21 @@ class SynchDistrictPrice {
}
- def findAllEsData(){
+ def findAllEsData(source){
def names = new HashSet()
def rets = []
ElasticUtils.executeSqlQuery("select * from community where source='±´¿Ç'", {d->
def s = d.city +"#"+d.region+"#"+d.name
if(!names.contains(s)){
names << s
- d.put("district_id", d.url)
- d.put("source", source)
- d.put("s_date", SHORT_DATE)
- d.removeField("root")
- d.removeField("url")
- d.removeField("_id")
+ def data = new BasicDBObject()
+ data.put("city", d.city)
+ data.put("region", d.region)
+ data.put("name", d.name)
+ data.put("address", d.address)
+ data.put("avg_price", d.avg_price)
+ data.put("source", source)
+ data.put("s_date", SHORT_DATE)
rets << d
}
})
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;
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/close.png b/projects/fangjia-static/src/main/webapp/images/fangjia/close.png
index d7c505004..eb922969a 100644
Binary files a/projects/fangjia-static/src/main/webapp/images/fangjia/close.png and b/projects/fangjia-static/src/main/webapp/images/fangjia/close.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png
new file mode 100644
index 000000000..7adae690c
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png differ
diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/partner_m1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/partner_m1.png
new file mode 100644
index 000000000..29a24acc4
Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/partner_m1.png differ
|