Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+3
-3
@@ -305,11 +305,11 @@ public class EvaluationAuditController {
|
||||
if(trades!=null && model.getAuditPrice()!=null){
|
||||
int charge = 0;
|
||||
if(model.getAuditPrice() > 0 && model.getAuditPrice() <= 100){
|
||||
charge = 40;
|
||||
charge = 20;
|
||||
}else if(model.getAuditPrice() > 100 && model.getAuditPrice() <= 300){
|
||||
charge = 160;
|
||||
charge = 70;
|
||||
}else if(model.getAuditPrice() > 300){
|
||||
charge = 360;
|
||||
charge = 80;
|
||||
}
|
||||
trades.setCharge((int) charge);
|
||||
userTradesService.update(trades);
|
||||
|
||||
+3
-3
@@ -401,11 +401,11 @@ public class YugudanController {
|
||||
double price = model.getPeopleEditPrice();
|
||||
double charge = 0;
|
||||
if(price > 0 && price <= 100){
|
||||
charge = 40;
|
||||
charge = 20;
|
||||
}else if(price > 100 && price <= 300){
|
||||
charge = 160;
|
||||
charge = 70;
|
||||
}else if(price > 300){
|
||||
charge = 360;
|
||||
charge = 80;
|
||||
}
|
||||
|
||||
EvaluationAudit audit = evaluationAuditService.findByEvalutionId(String.valueOf(model.getId()));
|
||||
|
||||
@@ -316,11 +316,11 @@
|
||||
var price = new Number(val)*10000
|
||||
var charge = 0;
|
||||
if(price > 0 && price <= 1000000){
|
||||
charge = 40;
|
||||
charge = 20;
|
||||
}else if(price > 1000000 && price <= 3000000){
|
||||
charge = 160;
|
||||
charge = 70;
|
||||
}else if(price > 3000000){
|
||||
charge = 360
|
||||
charge = 80;
|
||||
}
|
||||
if(price != 0){
|
||||
$(id).html(charge+'元');
|
||||
|
||||
@@ -25,8 +25,6 @@ import java.util.zip.GZIPOutputStream;
|
||||
|
||||
import com.hankcs.hanlp.HanLP;
|
||||
import com.hankcs.hanlp.dictionary.py.Pinyin;
|
||||
import com.sun.javafx.scene.transform.TransformUtils;
|
||||
import net.sf.json.JSON;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONNull;
|
||||
import net.sf.json.JSONObject;
|
||||
@@ -1847,7 +1845,7 @@ public class DataUtil {
|
||||
//
|
||||
// System.out.println(FourUpSixInto("258.393", 2));
|
||||
|
||||
String href = encodePicUrl("62afd81d303c3f827833bb03", "o", "upload");
|
||||
String href = encodePicUrl("635240149c21300bba5184e1", "o", "upload");
|
||||
String link = "http://static.fangjia.com/stc/fs/"+href;
|
||||
System.out.println(link);
|
||||
}
|
||||
|
||||
+7
@@ -107,4 +107,11 @@ public class SolutionController {
|
||||
*/
|
||||
public Object paimaiAction(FangjiaModel model){return model;}
|
||||
|
||||
/**
|
||||
* 财力评级解决方案
|
||||
* @param model
|
||||
* @return
|
||||
*/
|
||||
public Object financialAction(FangjiaModel model){return model;}
|
||||
|
||||
}
|
||||
|
||||
@@ -38,7 +38,9 @@
|
||||
<a href="${wwwUrl}/resource/industry" target="_blank">行业动态</a>
|
||||
<a href="${wwwUrl}/resource/analysis" target="_blank">数据分析</a>
|
||||
<a href="${wwwUrl}/resource/case" target="_blank">成功案例</a>
|
||||
<a href="${wwwUrl}/resource/company" target="_blank">公司动态</a>
|
||||
<a href="https://sh.fangjia.com/" target="_blank">各路客</a>
|
||||
<a href="http://user.fangjia.com/" target="_blank">房价通</a>
|
||||
<a href="https://www.didatai.com/" target="_blank">地数</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
<li><a href="${wwwUrl}/industry/corporation">行业企业</a></li>
|
||||
<li><a href="${wwwUrl}/industry/consulting">咨询研究</a></li>
|
||||
<li><a href="${wwwUrl}/solution/paimai">司法拍卖</a></li>
|
||||
<li><a href="${wwwUrl}/solution/paimai">财力评级</a></li>
|
||||
</ul>
|
||||
<ul>
|
||||
<li><a href="${wwwUrl}/solution/appraisal">贷前估值解决方案</a></li>
|
||||
@@ -43,6 +44,7 @@
|
||||
<li><a href="${wwwUrl}/solution/standardization">地址标准化解决方案</a></li>
|
||||
<li><a href="${wwwUrl}/solution/api">API数据接口解决方案</a></li>
|
||||
<li><a href="${wwwUrl}/solution/paimai">法拍房数据解决方案</a></li>
|
||||
<li><a href="${wwwUrl}/solution/financial">财力评级解决方案</a></li>
|
||||
</div>
|
||||
</li>
|
||||
<li class="subnav05 <#if controllerName == 'product' || controllerName == 'cpdb' || (controllerName == 'solution' && actionName == 'apiDoc')>current</#if>">
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>财力评级解决方案 - 房价网 fangjia.com</title>
|
||||
<meta name="keywords" content="财力评级">
|
||||
<meta name="description" content="房价网基于地理位置的财力评级分析">
|
||||
<#include "../jsconstants.ftl" />
|
||||
|
||||
<link href="${staticUrl}/style/fangjia/v5/common.css?v=${version}" rel="stylesheet">
|
||||
<link href="${staticUrl}/style/fangjia/v5/main.css?v=${version}" rel="stylesheet">
|
||||
<link href="${staticUrl}/style/fangjia/v5/dialogBox.css?v=${version}" rel="stylesheet">
|
||||
<script src="${staticUrl}/js/fangjia/v5/jquery-1.7.2.min.js?v=${version}"></script>
|
||||
|
||||
<style>
|
||||
.column > div p{width:550px;}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
if((navigator.userAgent.match(/(iPad|iPhone|iPod|Android|ios)/i))){
|
||||
document.write("<link href='${staticUrl}/style/fangjia/v5/mobile.css?v=${version}' rel='stylesheet'>");
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@media(max-device-width:768px){
|
||||
.column > div > div > p{padding:0;}
|
||||
.banner {
|
||||
height: 25.6rem;
|
||||
}
|
||||
body > .adBox p{width:92%;margin:0 auto;}
|
||||
.adBox01 .link01_btn {
|
||||
margin-top: 0.2rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<#include "/header/v5/_header.ftl"/>
|
||||
|
||||
<div class="banner mobile01" style="background:url(${staticUrl}/images/fangjia/v5/f-level_banner.png) no-repeat center center;">
|
||||
<div>
|
||||
<p class="p01"><small>财力评级解决方案</small></p>
|
||||
<p class="p02"><label>基于地理位置的财力评级</label></p>
|
||||
<p>
|
||||
<small>
|
||||
地理位置与经济实力息息相关<br/>
|
||||
居住品质是甄别财富客户的有效指征<br/>
|
||||
地址价值挖掘,用AI算法深度解析地址背后的信息,助力企业找到“对的人”
|
||||
</small>
|
||||
</p>
|
||||
<div class="btnGroup">
|
||||
<a class="link_btn link01_btn large" data_id="1024" cat="solution">立即体验</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="banner mobile02" style="background:url(${staticUrl}/images/fangjia/v5/f-level_banner.png) no-repeat center center;background-size:100%;">
|
||||
<div>
|
||||
<p class="p01"><small>财力评级解决方案</small></p>
|
||||
<p class="p02"><label>基于地理位置的财力评级</label></p>
|
||||
<p class="p02">
|
||||
<small>
|
||||
地理位置与经济实力息息相关<br/>
|
||||
居住品质是甄别财富客户的有效指征<br/>
|
||||
地址价值挖掘,用AI算法深度解析地址背后的信息,助力企业找到“对的人”
|
||||
</small>
|
||||
</p>
|
||||
<div class="btnGroup" style="margin-top: -25px;">
|
||||
<a class="link_btn link01_btn large" data_id="1024" cat="solution">立即体验</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="columnBox firstOne firstOneM">
|
||||
<p style="margin-bottom: 40px;">财力评级服务介绍</p>
|
||||
<div class="column">
|
||||
<div class="column_left mobile01" style="margin-left:40px;margin-top:45px;">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-1.png" style="width: 230px;height: 225px;">
|
||||
</div>
|
||||
<div class="column_left mobile02">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-1.png">
|
||||
</div>
|
||||
<div class="mobile01" style="margin-top: 5px;margin-left: 80px;float: left;">
|
||||
<div>
|
||||
<p><span>
|
||||
各行各业尤其是金融行业,在业务运营过程中,积累了大量的地址信息。而这些地址信息普遍缺乏数据治理、价值计算、场景赋能,地址价值有待挖掘。<br/>
|
||||
估家科技创新研发的客户(地址)财力评级服务,是以地理位置为核心,通过人工智能对地址数据进行自动化治理、打破数据壁垒将不同维度的数据链接、结合业务场景建立评级模型、输出基于地址的综合财力评级,从而实现客户分层。<br/>
|
||||
通过地址-房产-地段-环境等要素实现的财力评级,可以精准筛选财富客户,或锁定特定的目标客群,并为不同层级的客户设计相应的营销策略,以提升营销ROI。</span></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mobile02">
|
||||
<div>
|
||||
<p><span>各行各业尤其是金融行业,在业务运营过程中,积累了大量的地址信息。而这些地址信息普遍缺乏数据治理、价值计算、场景赋能,地址价值有待挖掘。
|
||||
|
||||
估家科技创新研发的客户(地址)财力评级服务,是以地理位置为核心,通过人工智能对地址数据进行自动化治理、打破数据壁垒将不同维度的数据链接、结合业务场景建立评级模型、输出基于地址的综合财力评级,从而实现客户分层。
|
||||
|
||||
通过地址-房产-地段-环境等要素实现的财力评级,可以精准筛选财富客户,或锁定特定的目标客群,并为不同层级的客户设计相应的营销策略,以提升营销ROI。</span></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columnBox bg mobile01" style="padding: 40px 0;">
|
||||
<div class="column">
|
||||
<div class="column_left" style="margin-top:80px;">
|
||||
<p><label>解决难题 </label></p>
|
||||
<p><small>1. 治理难 —— 实现人工智能级批量地址标准化及综合治理</small></p>
|
||||
<p><small>2. 数据缺 —— 对不活跃的客户缺少业务数据,无法有效分层</small></p>
|
||||
<p><small>3. 经验少 —— 缺乏以地址为核心的多维度数据关联及建模经验</small></p>
|
||||
<p><small>4. 效果差 —— 单一的营销策略,无法有效增量促活</small></p>
|
||||
</div>
|
||||
<div class="column_right">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-2.png" style="width: 200px;height: 350px;">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columnBox bg mobile02">
|
||||
<div class="column">
|
||||
<div class="column_left" style="margin:1rem 0;">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-2.png" style="width: 100px;height: 200px;">
|
||||
</div>
|
||||
<div class="column_right">
|
||||
<p><label>解决难题 </label></p>
|
||||
<p><small>1. 治理难 —— 实现人工智能级批量地址标准化及综合治理</small></p>
|
||||
<p><small>2. 数据缺 —— 对不活跃的客户缺少业务数据,无法有效分层</small></p>
|
||||
<p><small>3. 经验少 —— 缺乏以地址为核心的多维度数据关联及建模经验</small></p>
|
||||
<p><small>4. 效果差 —— 单一的营销策略,无法有效增量促活</small></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columnBox firstOne firstOneM">
|
||||
<div class="column">
|
||||
<div class="column_center">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-3.png" class="mobile01">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-3.png" class="mobile02 mobile02a" style="margin-bottom:3rem;">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columnBox firstOne firstOneM">
|
||||
<div class="column">
|
||||
<div class="column_center">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-4.png" class="mobile01">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-4.png" class="mobile02 mobile02a" style="margin-bottom:3rem;">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="columnBox firstOne firstOneM">
|
||||
<div class="column">
|
||||
<div class="column_center">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-5.png" class="mobile01">
|
||||
<img src="${staticUrl}/images/fangjia/v5/f-level-5.png" class="mobile02 mobile02a" style="margin-bottom:3rem;">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="adBox adBox01 mobile01">
|
||||
<p style="margin-top: -10px"><label>财力评级解决方案</label></p>
|
||||
<p><small>如想获取您所关注城市的财力评级数据,请致电 <b style="font-size: 18px;color: yellow;">400-188-3787</b> 联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。</small></p>
|
||||
<a class="link_btn link01_btn" data_id="1024" cat="solution" >立即体验</a>
|
||||
</div>
|
||||
<div class="adBox adBox01 mobile02">
|
||||
<p><label>财力评级解决方案</label></p>
|
||||
<p><small>如想获取您所关注城市的财力评级数据,请致电<label>400-188-3787</label>联系我们,或者留下您的联系方式和需求,我们会第一时间联系您。</small></p>
|
||||
<a class="link_btn link01_btn" data_id="1024" cat="solution">立即体验</a>
|
||||
</div>
|
||||
|
||||
<div class="resource" data-url = "${wwwUrl}/resource/recommend?module=1015"></div>
|
||||
|
||||
<div class="adBox adBox02">
|
||||
<div>
|
||||
<div>
|
||||
<p><label>CPDB房产大数据库</label></p>
|
||||
<p><small>欢迎亲自体验CPDB房产大数据库,您可通过在线方式申请测试数据或联系数据顾问,他们将非常乐意为您的数据需求量身定制合适的解决方案。</small></p>
|
||||
</div>
|
||||
<div class="btnGroup">
|
||||
<a class="link_btn link01_btn" href="${wwwUrl}/cpdb/">CPDB大数据</a>
|
||||
<a class="link_btn link01_btn" href="${wwwUrl}/solution/api">API解决方案</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<#include "/header/v5/_footer.ftl"/>
|
||||
|
||||
<script src="${staticUrl}/js/fangjia/v5/main.js?v=${version}"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -415,7 +415,7 @@ public abstract class AbstractMongoDao<E extends MongoEntity> extends AbstractJp
|
||||
try {
|
||||
writeMethod.invoke(entity, value);
|
||||
} catch (IllegalArgumentException e) {
|
||||
logger.error("Error set value to " + value + "[" + value.getClass() + "] of field "
|
||||
logger.error("["+key+"] Error set value to " + value + "[" + value.getClass() + "] of field "
|
||||
+ descriptor.getName() + "[" + descriptor.getPropertyType() + "], class:" + entity.getClass().getSimpleName());
|
||||
throw new RuntimeException("Error set value to " + value + "[" + value.getClass() + "] of field "
|
||||
+ descriptor.getName() + "[" + descriptor.getPropertyType() + "]", e);
|
||||
|
||||
+2
-1
@@ -28,7 +28,8 @@ public enum NewResourceRecommendEnum {
|
||||
FJT("1020", "房价通"),
|
||||
FANG_JIA_ZOU_SHI("1021", "房价走势"),
|
||||
FDANG_DIAO_BAO_GAO("1022", "房调报告"),
|
||||
FA_PAI_FANG("1023", "法拍房数据解决方案");
|
||||
FA_PAI_FANG("1023", "法拍房数据解决方案"),
|
||||
FINANCIAL_LEVEL("1024", "财力评级解决方案");
|
||||
|
||||
|
||||
NewResourceRecommendEnum(String id, String value) {
|
||||
|
||||
+2
-1
@@ -24,7 +24,8 @@ public enum SalesLeadEnum {
|
||||
BUSINESS_ASK("1018", "业务咨询"),
|
||||
HOUSE_EVAL("1019", "房产评估"),
|
||||
DIDATA("1020", "地数平台"),
|
||||
FA_PAI_FANG("1023", "法拍房数据解决方案");
|
||||
FA_PAI_FANG("1023", "法拍房数据解决方案"),
|
||||
FINANCIAL_LEVEL("1024", "财力评级解决方案");
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.fangjia.dal.sql.model;
|
||||
import com.fangjia.dal.SqlEntity;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.Date;
|
||||
|
||||
@Entity
|
||||
@Table(name = "report_file_attach")
|
||||
@@ -14,6 +15,7 @@ public class ReportFileAttach implements SqlEntity {
|
||||
private Integer fileClass;//1:询价单 2:产证 3:房屋照片 4:其它附件 5:产调报告或权籍
|
||||
private String fileName;
|
||||
private String fileId;
|
||||
private Date dateCreated;
|
||||
|
||||
@Id
|
||||
@Column(name = "id")
|
||||
@@ -79,4 +81,13 @@ public class ReportFileAttach implements SqlEntity {
|
||||
public void setFileId(String fileId) {
|
||||
this.fileId = fileId;
|
||||
}
|
||||
|
||||
@Column(name = "c_date")
|
||||
public Date getDateCreated() {
|
||||
return dateCreated;
|
||||
}
|
||||
|
||||
public void setDateCreated(Date dateCreated) {
|
||||
this.dateCreated = dateCreated;
|
||||
}
|
||||
}
|
||||
|
||||
+158
-5
@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import com.fangjia.core.util.*;
|
||||
import com.fangjia.open.model.*;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
@@ -54,11 +55,6 @@ import com.fangjia.open.OpenConfig;
|
||||
import com.fangjia.open.dto.UniversalDto;
|
||||
import com.fangjia.open.interceptors.Authority;
|
||||
import com.fangjia.open.interceptors.Role;
|
||||
import com.fangjia.open.model.AddesssMatchModel;
|
||||
import com.fangjia.open.model.AddressModel;
|
||||
import com.fangjia.open.model.BasicModel;
|
||||
import com.fangjia.open.model.RateModel;
|
||||
import com.fangjia.open.model.RestfulModelAndView;
|
||||
import com.fangjia.service.address.AddressParser;
|
||||
import com.fangjia.service.address.AddressParserService;
|
||||
import com.fangjia.service.address.AddressParserUtil;
|
||||
@@ -1931,6 +1927,163 @@ public class AddressController {
|
||||
return mav;
|
||||
}
|
||||
|
||||
/**
|
||||
* 地址信息分类接口
|
||||
* @param model
|
||||
* @return
|
||||
*/
|
||||
public Object communitySummaryAction(CommunitySummaryRequestDto model) {
|
||||
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getAddress())) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
HttpRequest request = new HttpRequest();
|
||||
JSONObject json = null;
|
||||
try{
|
||||
Map<String, String> headers = new HashMap<String, String>();
|
||||
headers.put("Content-Type", "application/json");
|
||||
|
||||
JSONObject reqBody = new JSONObject();
|
||||
reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
|
||||
reqBody.put("address", model.getAddress());
|
||||
reqBody.put("area", model.getArea());
|
||||
reqBody.put("maxFloor", model.getMaxFloor());
|
||||
reqBody.put("housePurpose", model.getHousePurpose());
|
||||
reqBody.put("memo", model.getMemo());
|
||||
|
||||
String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/communitySummary", reqBody ,headers, "UTF-8");
|
||||
if(result != null){
|
||||
try{
|
||||
json = JSONObject.fromObject(result);
|
||||
} catch(Exception e){
|
||||
json = null;
|
||||
}
|
||||
}
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (json != null) {
|
||||
int code = json.getInt("status");
|
||||
String msg = json.getString("msg");
|
||||
BasicModel basicModel = new BasicModel(code, msg);
|
||||
if(json.containsKey("result")){
|
||||
basicModel.setResult(json.get("result"));
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
/**
|
||||
* 楼盘评级
|
||||
* @param model
|
||||
* @return
|
||||
*/
|
||||
public Object buildingRatingAction(CommunitySummaryRequestDto model) {
|
||||
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getAddress())) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
HttpRequest request = new HttpRequest();
|
||||
JSONObject json = null;
|
||||
try{
|
||||
Map<String, String> headers = new HashMap<String, String>();
|
||||
headers.put("Content-Type", "application/json");
|
||||
|
||||
JSONObject reqBody = new JSONObject();
|
||||
reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
|
||||
reqBody.put("address", model.getAddress());
|
||||
reqBody.put("area", model.getArea());
|
||||
reqBody.put("maxFloor", model.getMaxFloor());
|
||||
reqBody.put("housePurpose", model.getHousePurpose());
|
||||
reqBody.put("memo", model.getMemo());
|
||||
String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/buildingRating", reqBody, headers, "UTF-8");
|
||||
if(result != null){
|
||||
try{
|
||||
json = JSONObject.fromObject(result);
|
||||
} catch(Exception e){
|
||||
json = null;
|
||||
}
|
||||
}
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (json != null) {
|
||||
int code = json.getInt("status");
|
||||
String msg = json.getString("msg");
|
||||
BasicModel basicModel = new BasicModel(code, msg);
|
||||
if(json.containsKey("result")){
|
||||
basicModel.setResult(json.get("result"));
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
/**
|
||||
* 财力评级
|
||||
* @param model
|
||||
* @return
|
||||
*/
|
||||
public Object financialRatingAction(CommunitySummaryRequestDto model) {
|
||||
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getAddress())) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("地址不能为空"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
HttpRequest request = new HttpRequest();
|
||||
JSONObject json = null;
|
||||
try{
|
||||
Map<String, String> headers = new HashMap<String, String>();
|
||||
headers.put("Content-Type", "application/json");
|
||||
|
||||
JSONObject reqBody = new JSONObject();
|
||||
reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity());
|
||||
reqBody.put("address", model.getAddress());
|
||||
reqBody.put("area", model.getArea());
|
||||
reqBody.put("maxFloor", model.getMaxFloor());
|
||||
reqBody.put("housePurpose", model.getHousePurpose());
|
||||
reqBody.put("memo", model.getMemo());
|
||||
String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/financialRating", reqBody, headers,"UTF-8");
|
||||
if(result != null){
|
||||
try{
|
||||
json = JSONObject.fromObject(result);
|
||||
} catch(Exception e){
|
||||
json = null;
|
||||
}
|
||||
}
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (json != null) {
|
||||
int code = json.getInt("status");
|
||||
String msg = json.getString("msg");
|
||||
BasicModel basicModel = new BasicModel(code, msg);
|
||||
if(json.containsKey("result")){
|
||||
basicModel.setResult(json.get("result"));
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
public Object similarityAction(AddesssMatchModel model) {
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) {
|
||||
|
||||
+87
-29
@@ -232,13 +232,37 @@ public class WeiXinEvaluationController {
|
||||
jsonObject.put("rn", fjtEvaluation.getRoomNum());
|
||||
jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//物业类型
|
||||
jsonObject.put("mj", fjtEvaluation.getHouseArea());//面积
|
||||
String zj = "-";
|
||||
if(evaluationAudit != null && evaluationAudit.getInquirePrice() > 0){
|
||||
zj = String.valueOf((int)(evaluationAudit.getInquirePrice() / 10000));
|
||||
double zj = DataUtil.getDoubleRound(2, evaluationAudit.getInquirePrice() / 10000.0);
|
||||
if(zj == (int)zj){
|
||||
jsonObject.put("zj", (int)zj);//总价
|
||||
}else{
|
||||
jsonObject.put("zj", zj);//总价
|
||||
}
|
||||
}else{
|
||||
jsonObject.put("zj", "-");//总价
|
||||
}
|
||||
if(evaluationAudit == null || evaluationAudit.getHopePrice() == null){
|
||||
jsonObject.put("ckj","-");
|
||||
}else{
|
||||
double ckj = DataUtil.getDoubleRound(2,evaluationAudit.getHopePrice()/10000.0);
|
||||
if(ckj == (int)ckj){
|
||||
jsonObject.put("ckj", (int)ckj);//期望价
|
||||
}else{
|
||||
jsonObject.put("ckj", ckj);//期望价
|
||||
}
|
||||
}
|
||||
|
||||
if(evaluationAudit == null || evaluationAudit.getLastPrice() == null){
|
||||
jsonObject.put("zsj","-");
|
||||
}else{
|
||||
double zsj = DataUtil.getDoubleRound(2,evaluationAudit.getLastPrice()/ 10000.0);
|
||||
if(zsj == (int)zsj){
|
||||
jsonObject.put("zsj", (int)zsj);//终审价
|
||||
}else{
|
||||
jsonObject.put("zsj", zsj);//终审价
|
||||
}
|
||||
}
|
||||
jsonObject.put("zj", zj);//总价
|
||||
jsonObject.put("ckj", (evaluationAudit == null || evaluationAudit.getHopePrice() == null) ? "-" : (int)(evaluationAudit.getHopePrice()/ 10000));//期望价
|
||||
jsonObject.put("zsj", (evaluationAudit == null || evaluationAudit.getLastPrice() == null) ? "-" : (int)(evaluationAudit.getLastPrice()/ 10000));//终审价
|
||||
jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//主贷人
|
||||
if(evaluationAudit==null || (evaluationAudit!=null && StringUtils.isBlank(evaluationAudit.getInquireRemark()))){
|
||||
jsonObject.put("pgsm","");//评估说明
|
||||
@@ -258,7 +282,12 @@ public class WeiXinEvaluationController {
|
||||
if(totalPrice>0){
|
||||
evaluationAudit.setAuditStatus(1);
|
||||
evaluationAudit.setInquirePrice(totalPrice);
|
||||
jsonObject.put("zj", (int)(totalPrice/10000));
|
||||
double zj = DataUtil.getDoubleRound(2, totalPrice / 10000.0);
|
||||
if(zj == (int)zj){
|
||||
jsonObject.put("zj", (int)zj);//总价
|
||||
}else{
|
||||
jsonObject.put("zj", zj);//总价
|
||||
}
|
||||
bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit);
|
||||
jsonObject.put("shzt", "价格已审核");
|
||||
}
|
||||
@@ -283,8 +312,16 @@ public class WeiXinEvaluationController {
|
||||
evaluationAudit.setAuditStatus(3);
|
||||
evaluationAudit.setLastPrice(inquirePrice);
|
||||
evaluationAudit.setFeedbackStatus(feedbackStatus);
|
||||
evaluationAudit.setFeedbackMsg((String)object.get("feedbackCallMsg"));
|
||||
jsonObject.put("zsj",(int)(inquirePrice/ 10000));//终审价
|
||||
Object callMsg = object.get("feedbackCallMsg");
|
||||
if(!callMsg.toString().equals("null")){
|
||||
evaluationAudit.setFeedbackMsg((String)object.get("feedbackCallMsg"));
|
||||
}
|
||||
double zsj = DataUtil.getDoubleRound(2,inquirePrice/ 10000.0);//终审价
|
||||
if(zsj == (int)zsj){
|
||||
jsonObject.put("zsj", (int)zsj);//终审价
|
||||
}else{
|
||||
jsonObject.put("zsj", zsj);//终审价
|
||||
}
|
||||
bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit);
|
||||
jsonObject.put("shzt", "审核完成");
|
||||
}
|
||||
@@ -403,6 +440,9 @@ public class WeiXinEvaluationController {
|
||||
|
||||
public Object businessUserEvaluateAction(EvaluationModel model, HttpServletRequest request){
|
||||
|
||||
JsonModel json = new JsonModel();
|
||||
Map<String, String> data = new HashMap<String, String>();
|
||||
|
||||
District district = districtService.findById(model.getDistrict().getId());
|
||||
FjtEvaluation evaluation = model.getFjtEvaluation();
|
||||
if(evaluation.getHouseArea() <=0 || evaluation.getHouseHight() <= 0
|
||||
@@ -414,9 +454,7 @@ public class WeiXinEvaluationController {
|
||||
evaluation.setCity(district.getCity());
|
||||
evaluation.setRegion(district.getRegion());
|
||||
evaluation.setDistrictName(district.getName());
|
||||
if(StringUtils.isBlank(evaluation.getAddress())){
|
||||
evaluation.setAddress(district.getAddress());
|
||||
}
|
||||
evaluation.setAddress(district.getAddress());
|
||||
evaluation.setUserId(userId);
|
||||
evaluation.setDateCreated(new Date());
|
||||
evaluation.setLastUpdated(new Date());
|
||||
@@ -451,8 +489,8 @@ public class WeiXinEvaluationController {
|
||||
|
||||
|
||||
if(fjtUser!=null && fjtUser.getRole()==17) {
|
||||
System.out.println("渤海地址搜索 "+evaluation.getAddress());
|
||||
List<JSONObject> bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getAddress());
|
||||
System.out.println("渤海地址搜索 "+evaluation.getCertificateAddress());
|
||||
List<JSONObject> bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getCertificateAddress());
|
||||
JSONObject o = null;
|
||||
if(bhDists.size()==0){
|
||||
bhDists = BHBankUtils.getDistrictByBhbank(district.getName());
|
||||
@@ -481,7 +519,7 @@ public class WeiXinEvaluationController {
|
||||
if(o != null){
|
||||
|
||||
String bhDistName = (String)o.get("name");
|
||||
String regionCode = String.valueOf((Long)o.get("country"));
|
||||
String regionCode = String.valueOf(o.get("country"));
|
||||
String bhRegion = BHBankUtils.regionCodeMap.get(regionCode);
|
||||
bhMatchMap.put("preCode", (String)o.get("code"));
|
||||
bhMatchMap.put("preName", bhDistName);
|
||||
@@ -505,18 +543,18 @@ public class WeiXinEvaluationController {
|
||||
if(StringUtils.isBlank(usersDetail.getMobile())){
|
||||
usersDetail.setMobile(fjtUser.getEmail());
|
||||
}
|
||||
System.out.println("渤海询价搜索 "+evaluation.getAddress());
|
||||
System.out.println("渤海询价搜索 "+evaluation.getCertificateAddress());
|
||||
JSONObject bhApiResult = BHBankUtils.getInquirePrice(model, bhMatchMap, usersDetail, evaluation.getTotalPrice());
|
||||
if(bhApiResult!=null){
|
||||
if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==0){
|
||||
System.out.println("渤海询价搜索结果 "+bhApiResult.toString());
|
||||
JSONObject dataObj = (JSONObject) bhApiResult.get("data");
|
||||
String queryId = (String) dataObj.get("queryId");
|
||||
Integer inquirePrice = (Integer) dataObj.get("inquirePrice");
|
||||
Integer auditStatus = null;
|
||||
Integer auditStatus = 0;
|
||||
String inquireRemark = (String) dataObj.get("remark");
|
||||
if((Integer) bhApiResult.get("errCode") == 1){//待人工核验
|
||||
auditStatus = 0;
|
||||
}else if((Integer) bhApiResult.get("errCode") == 0){//正常返回
|
||||
}else if((Integer) bhApiResult.get("errCode") == 0 && inquirePrice>0){//正常返回
|
||||
auditStatus = 1;
|
||||
}
|
||||
|
||||
@@ -536,16 +574,25 @@ public class WeiXinEvaluationController {
|
||||
audit.setDateCreated(new Date());
|
||||
audit.setDateCreated(new Date());
|
||||
bohaiEvaluationAuditService.saveBohaiEvaluationAudit(audit);
|
||||
}else{
|
||||
if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==1){
|
||||
JSONObject dataObj = (JSONObject) bhApiResult.get("data");
|
||||
if(StringUtils.isNotBlank((String)dataObj.get("remark"))){
|
||||
data.put("msg", (String)dataObj.get("remark"));
|
||||
}else{
|
||||
data.put("msg", "估价失败,请重新评估!");
|
||||
}
|
||||
}else{
|
||||
data.put("msg", "估价失败,请重新评估!");
|
||||
}
|
||||
}
|
||||
}else{
|
||||
fjtEvaluationService.saveEvaluation(evaluation);
|
||||
System.out.println("保存评估记录成功 "+evaluation.getDistrictName());
|
||||
}
|
||||
|
||||
Map<String, String> data = new HashMap<String, String>();
|
||||
data.put("id", String.valueOf(evaluation.getId()));
|
||||
data.put("role", String.valueOf(fjtUser.getRole()));
|
||||
JsonModel json = new JsonModel();
|
||||
json.setJsonModel(data);
|
||||
return json;
|
||||
}
|
||||
@@ -623,8 +670,6 @@ public class WeiXinEvaluationController {
|
||||
model.setEvaluationAudit(evaluationAudit);
|
||||
|
||||
if(fjtUser!=null && fjtUser.getRole()==17 && district.getCity().equals("上海")){
|
||||
|
||||
|
||||
Map<String, Object> retMap = getLoanInfo(district, evaluation.getHouseArea());
|
||||
if(retMap!=null && retMap.size()>0){
|
||||
model.setLoanInfoMap(retMap);
|
||||
@@ -678,7 +723,6 @@ public class WeiXinEvaluationController {
|
||||
}
|
||||
return model;
|
||||
}
|
||||
|
||||
//To C 报告结果页
|
||||
public Object resultAction(EvaluationModel model){
|
||||
String evaluationId = model.getEvaluationId();
|
||||
@@ -890,7 +934,7 @@ public class WeiXinEvaluationController {
|
||||
if(StringUtils.isNotBlank(model.getEvaluationId()) && model.getHopePrice()!=null){
|
||||
BohaiEvaluationAudit evaluationAudit = bohaiEvaluationAuditService.findByBohaiEvaluationAuditId(Long.valueOf(model.getEvaluationId()));
|
||||
if(evaluationAudit != null){
|
||||
evaluationAudit.setHopePrice(model.getHopePrice()*10000);
|
||||
evaluationAudit.setHopePrice((int)(model.getHopePrice()*10000));
|
||||
evaluationAudit.setLastUpdated(new Date());
|
||||
evaluationAudit.setAuditStatus(2);
|
||||
|
||||
@@ -1108,10 +1152,13 @@ public class WeiXinEvaluationController {
|
||||
formalReportService.update(formalReport);
|
||||
}
|
||||
}
|
||||
Integer code = BHBankUtils.inquireToReport(bohaiEvaluationAudit.getQueryId(), model.getAddress());
|
||||
Map<String, Integer> data = new HashMap<String, Integer>();
|
||||
data.put("code", code);
|
||||
jsonModel.setJsonModel(data);
|
||||
JSONObject jsonObj = BHBankUtils.inquireToReport(bohaiEvaluationAudit.getQueryId(), model.getAddress());
|
||||
if(jsonObj!=null){
|
||||
Map<String, Object> data = new HashMap<String, Object>();
|
||||
data.put("code", (Integer)jsonObj.get("errCode"));
|
||||
data.put("msg", (String)jsonObj.get("errMsg"));
|
||||
jsonModel.setJsonModel(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
return jsonModel;
|
||||
@@ -1352,6 +1399,7 @@ public class WeiXinEvaluationController {
|
||||
reportFileAttach.setFileClass(model.getFileClass());
|
||||
reportFileAttach.setFileName(file.getOriginalFilename());
|
||||
reportFileAttach.setFileId(id);
|
||||
reportFileAttach.setDateCreated(new Date());
|
||||
reportFileAttachService.save(reportFileAttach);
|
||||
|
||||
fileDao.save(id,"upload","o", file.getBytes(), contentType);
|
||||
@@ -1360,7 +1408,17 @@ public class WeiXinEvaluationController {
|
||||
System.out.println(link);
|
||||
}
|
||||
if(uploadfiles.size()>0){
|
||||
BHBankUtils.inquireUploadFiles2(usersDetail.getName(),model.getQueryId(), model.getFileClass(), uploadfiles);
|
||||
JSONObject jsonObj = BHBankUtils.inquireUploadFiles2(usersDetail.getName(),model.getQueryId(), model.getFileClass(), uploadfiles);
|
||||
if(jsonObj!=null){
|
||||
if(jsonObj!=null && (Integer)jsonObj.get("errCode")!=0) {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg((String) jsonObj.get("errMsg")));
|
||||
}else{
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!")));
|
||||
}
|
||||
}else{
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("上传失败!"));
|
||||
}
|
||||
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
+1
-1
@@ -213,7 +213,7 @@ public class AuthenticationInterceptor implements Interceptor {
|
||||
if (null == apiUser) {
|
||||
return ret;
|
||||
}
|
||||
if(apiUser.getDeadTime() != null && new Date().after(apiUser.getDeadTime())){
|
||||
if(apiUser.getDeadTime() != null && DateUtil.truncateDay(new Date()).after(apiUser.getDeadTime())){
|
||||
return new HttpCode(OpenHttpCodeEnum.USER_EXPIRED);
|
||||
}
|
||||
if(!isOldUser(apiUser) && isExpired(token)){
|
||||
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
package com.fangjia.open.model;
|
||||
|
||||
|
||||
/**
|
||||
* 小区宽表入参DTO
|
||||
*
|
||||
* @author shenjian
|
||||
* @since 2022/10/11
|
||||
*/
|
||||
public class CommunitySummaryRequestDto extends FangjiaApiModel {
|
||||
|
||||
/**
|
||||
* 城市
|
||||
*/
|
||||
private String city;
|
||||
|
||||
/**
|
||||
* 地址
|
||||
*/
|
||||
private String address;
|
||||
|
||||
/**
|
||||
* 总楼层
|
||||
*/
|
||||
private Integer maxFloor;
|
||||
|
||||
/**
|
||||
* 面积
|
||||
*/
|
||||
private Float area;
|
||||
|
||||
/**
|
||||
* 房屋用途
|
||||
*/
|
||||
private String housePurpose;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String memo;
|
||||
|
||||
public String getCity() {
|
||||
return city;
|
||||
}
|
||||
|
||||
public void setCity(String city) {
|
||||
this.city = city;
|
||||
}
|
||||
|
||||
public String getAddress() {
|
||||
return address;
|
||||
}
|
||||
|
||||
public void setAddress(String address) {
|
||||
this.address = address;
|
||||
}
|
||||
|
||||
public Integer getMaxFloor() {
|
||||
return maxFloor;
|
||||
}
|
||||
|
||||
public void setMaxFloor(Integer maxFloor) {
|
||||
this.maxFloor = maxFloor;
|
||||
}
|
||||
|
||||
public Float getArea() {
|
||||
return area;
|
||||
}
|
||||
|
||||
public void setArea(Float area) {
|
||||
this.area = area;
|
||||
}
|
||||
|
||||
public String getHousePurpose() {
|
||||
return housePurpose;
|
||||
}
|
||||
|
||||
public void setHousePurpose(String housePurpose) {
|
||||
this.housePurpose = housePurpose;
|
||||
}
|
||||
|
||||
public String getMemo() {
|
||||
return memo;
|
||||
}
|
||||
|
||||
public void setMemo(String memo) {
|
||||
this.memo = memo;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -43,7 +43,7 @@ public class EvaluationModel extends BaseModel{
|
||||
private Integer role;
|
||||
private String cardId;
|
||||
private Map<String, Object> loanInfoMap;
|
||||
private Integer hopePrice;
|
||||
private Double hopePrice;
|
||||
private String remark;
|
||||
private Integer loan;
|
||||
// private String preCode;//渤海接口--楼盘编码
|
||||
@@ -222,11 +222,11 @@ public class EvaluationModel extends BaseModel{
|
||||
this.bohaiEvaluationAudit = bohaiEvaluationAudit;
|
||||
}
|
||||
|
||||
public Integer getHopePrice() {
|
||||
public Double getHopePrice() {
|
||||
return hopePrice;
|
||||
}
|
||||
|
||||
public void setHopePrice(Integer hopePrice) {
|
||||
public void setHopePrice(Double hopePrice) {
|
||||
this.hopePrice = hopePrice;
|
||||
}
|
||||
|
||||
|
||||
@@ -17,54 +17,51 @@ import java.util.*;
|
||||
|
||||
public class BHBankUtils {
|
||||
|
||||
// public static String token = "bohaifangjiatest";//²âÊÔtoken
|
||||
// public static String uri = "http://topen.shbrea.com.cn/API";//²âÊÔ
|
||||
// public static String token = "bohaifangjia";// 原:bohaifangjiatest
|
||||
// public static String uri = "http://shbreac.ruitingcc.com/API/";//测试 原:http://topen.shbrea.com.cn/API
|
||||
|
||||
|
||||
public static String token = "bohaifangjia";//正式token
|
||||
public static String uri ="https://open.shbrea.com.cn/API";
|
||||
public static String uri = "http://bizapi.shbrea.com.cn/API"; //"https://open.shbrea.com.cn/API"; //正式 http://bizapi.shbrea.com.cn/API/
|
||||
|
||||
|
||||
public static String nonce = "818975";
|
||||
public static Map<String, String > regionCodeMap = new HashMap<String, String>(){{
|
||||
put("310101000000","»ÆÆÖ");
|
||||
put("310104000000","Ðì»ã");
|
||||
put("310105000000","³¤Äþ");
|
||||
put("310106000000","¾²°²");
|
||||
put("310107000000","ÆÕÍÓ");
|
||||
put("310109000000","ºç¿Ú");
|
||||
put("310110000000","ÑîÆÖ");
|
||||
put("310112000000","ãÉÐÐ");
|
||||
put("310113000000","±¦É½");
|
||||
put("310114000000","¼Î¶¨");
|
||||
put("310115000000","ÆÖ¶«");
|
||||
put("310116000000","½ðɽ");
|
||||
put("310117000000","Ëɽ");
|
||||
put("310118000000","ÇàÆÖ");
|
||||
put("310120000000","·îÏÍ");
|
||||
put("310230000000","³çÃ÷");
|
||||
put("11","黄浦");
|
||||
put("14","徐汇");
|
||||
put("12","长宁");
|
||||
put("13","静安");
|
||||
put("15","普陀");
|
||||
put("16","虹口");
|
||||
put("17","杨浦");
|
||||
put("19","闵行");
|
||||
put("20","宝山");
|
||||
put("21","嘉定");
|
||||
put("18","浦东");
|
||||
put("26","金山");
|
||||
put("25","松江");
|
||||
put("24","青浦");
|
||||
put("23","奉贤");
|
||||
put("22","崇明");
|
||||
}};
|
||||
|
||||
public static List<JSONObject> getDistrictByBhbank(String address){
|
||||
List<JSONObject> list = new ArrayList<JSONObject>();
|
||||
try {
|
||||
Map params = new HashMap();
|
||||
params.put("keyword",address);
|
||||
|
||||
// Thread.sleep(20*1000);
|
||||
Integer date1 = (int)(new Date().getTime()/1000);
|
||||
String str = token + date1.toString()+nonce;
|
||||
String md5str2 = MD5Util.encrypt(str,"utf-8");
|
||||
|
||||
Map params = new HashMap();
|
||||
params.put("keyword",address);
|
||||
Map headers = new HashMap();
|
||||
headers.put("timestamp", date1.toString());
|
||||
headers.put("sign", md5str2);
|
||||
headers.put("nonce", nonce.toString());
|
||||
|
||||
Integer date1 = (int)(new Date().getTime()/1000);
|
||||
String str = token + date1.toString()+nonce;
|
||||
String md5str2 = MD5Util.encrypt(str,"utf-8");
|
||||
|
||||
Map headers = new HashMap();
|
||||
headers.put("timestamp", date1.toString());
|
||||
headers.put("sign", md5str2);
|
||||
headers.put("nonce", nonce.toString());
|
||||
HttpRequest request = new HttpRequest();
|
||||
String content = null;
|
||||
content = request.get(uri +"/searchAddr/bh/", params, headers, "utf-8");
|
||||
HttpRequest request = new HttpRequest();
|
||||
String content = request.get(uri +"/searchAddr/bh/", params, headers, "utf-8");
|
||||
System.out.println("/searchAddr/bh/ :"+content);
|
||||
if(StringUtils.isNotBlank(content)){
|
||||
JSONObject jsonObj = JSONObject.fromObject(content);
|
||||
@@ -213,7 +210,7 @@ public class BHBankUtils {
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String inquireFeedback(String name, String queryId, Integer hopePrice){
|
||||
public static String inquireFeedback(String name, String queryId, Double hopePrice){
|
||||
String feedbackId = null;
|
||||
List<JSONObject> list = new ArrayList<JSONObject>();
|
||||
Map params = new HashMap();
|
||||
@@ -352,7 +349,7 @@ public class BHBankUtils {
|
||||
}
|
||||
|
||||
|
||||
public static Integer inquireUploadFiles2(String name, String queryId, Integer fileClass , List<File> uploadfiles){
|
||||
public static JSONObject inquireUploadFiles2(String name, String queryId, Integer fileClass , List<File> uploadfiles){
|
||||
Map params = new HashMap();
|
||||
params.put("queryId",queryId);
|
||||
params.put("userName",name);
|
||||
@@ -423,10 +420,7 @@ public class BHBankUtils {
|
||||
String content = response.body().string();
|
||||
JSONObject jsonObj = JSONObject.fromObject(content);
|
||||
System.out.println("上传接口返回:"+jsonObj.toString());
|
||||
Integer code = (Integer) jsonObj.get("errCode");
|
||||
if(code == 0){
|
||||
return code;
|
||||
}
|
||||
return jsonObj;
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -434,8 +428,7 @@ public class BHBankUtils {
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static Integer inquireToReport(String queryId, String reportMsg){
|
||||
public static JSONObject inquireToReport(String queryId, String reportMsg){
|
||||
String feedbackId = null;
|
||||
List<JSONObject> list = new ArrayList<JSONObject>();
|
||||
Map params = new HashMap();
|
||||
@@ -477,11 +470,9 @@ public class BHBankUtils {
|
||||
System.out.println("完成调用渤海转评估报告 "+content);
|
||||
if(StringUtils.isNotBlank(content)){
|
||||
JSONObject jsonObj = JSONObject.fromObject(content);
|
||||
Integer code = (Integer) jsonObj.get("errCode");
|
||||
if (code == 0) {
|
||||
return code;
|
||||
if(jsonObj.containsKey("errCode")){
|
||||
return jsonObj;
|
||||
}
|
||||
|
||||
}
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
|
||||
@@ -375,8 +375,13 @@ function clickFormalReport(){
|
||||
},
|
||||
dataType:"json",
|
||||
success:function(data){
|
||||
$.cookie("fjt-formal-report",address, {path:"/",expires: 30})
|
||||
alert("您的申请已提交,请耐心等待!");
|
||||
if(data && data.code!=0){
|
||||
alert(data.msg);
|
||||
}else{
|
||||
$.cookie("fjt-formal-report",address, {path:"/",expires: 30})
|
||||
alert("您的申请已提交,请耐心等待!");
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
// JavaScript Document
|
||||
|
||||
/* 选择操作 */
|
||||
|
||||
// 选择操作-地址
|
||||
$(document).on('click', '.create-actions00', function () {
|
||||
/*$(document).on('click', '.create-actions00', function () {
|
||||
var buttons1 = [
|
||||
{
|
||||
text: '请选择地址',
|
||||
@@ -31,6 +29,7 @@ $(document).on('click', '.create-actions00', function () {
|
||||
var groups = [buttons1, buttons2];
|
||||
$.actions(groups);
|
||||
});
|
||||
*/
|
||||
|
||||
// 选择操作-房型-室
|
||||
$(document).on('click', '.create-actions01', function () {
|
||||
|
||||
@@ -47,13 +47,17 @@
|
||||
|
||||
<li>
|
||||
<div class="item-content">
|
||||
|
||||
<div class="item-inner">
|
||||
<div class="content-block">
|
||||
<div class="item-title label di">地址:</div>
|
||||
<input name="fjtEvaluation.address" type="hidden" id="address" placeholder="请选择地址" required>
|
||||
<p class="di"><a href="#" class="create-actions00">请选择地址</a></p>
|
||||
<div class="item-title label">产证地址:</div>
|
||||
<div class="item-input">
|
||||
<input type="text" placeholder="请输入产证地址" id="certificateAddress"
|
||||
name="fjtEvaluation.certificateAddress" required>
|
||||
</div>
|
||||
<#-- <div class="content-block">-->
|
||||
<#-- <div class="item-title label di">地址:</div>-->
|
||||
<#-- <input name="fjtEvaluation.address" type="hidden" id="address" placeholder="请选择地址" required>-->
|
||||
<#-- <p class="di"><a href="#" class="create-actions00">请选择地址</a></p>-->
|
||||
<#-- </div>-->
|
||||
</div>
|
||||
<div class="item-media"><span>(必填项)</span></div>
|
||||
</div>
|
||||
@@ -252,16 +256,21 @@
|
||||
async: false,
|
||||
method: "POST",
|
||||
success: function (data) {
|
||||
if (data.id == undefined) {
|
||||
if(data.msg){
|
||||
$.toast("估价失败,请重新评估");
|
||||
$("#evaluateBtn").prop("disabled", false)
|
||||
} else {
|
||||
if(data.role == "17"){
|
||||
location.href = "bhreport?evaluationId=" + data.id
|
||||
}else{
|
||||
location.href = "report?evaluationId=" + data.id
|
||||
}else{
|
||||
if (data.id == undefined) {
|
||||
$.toast("估价失败,请重新评估");
|
||||
$("#evaluateBtn").prop("disabled", false)
|
||||
} else {
|
||||
if(data.role == "17"){
|
||||
location.href = "bhreport?evaluationId=" + data.id
|
||||
}else{
|
||||
location.href = "report?evaluationId=" + data.id
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
error: function(XMLHttpRequest){
|
||||
$.toast("服务器异常,请重新评估");
|
||||
|
||||
@@ -34,11 +34,11 @@
|
||||
<div class="topic">
|
||||
<div class="topicContent topicTop" style="padding:0px 20px;">
|
||||
<p>${fjtEvaluation.districtName!}</p>
|
||||
<p style="margin-top:-4px;"><i class="location"></i><small>${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("号")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}号</#if>${fjtEvaluation.roomNum!}室</small> <a href="../district/weXinList?cityName=${fjtEvaluation.city!}" class="collectionLink" style="line-height: 32px;">重新评估 ></a></p>
|
||||
<p style="margin-top:-4px;"><i class="location"></i><small><#if fjtEvaluation.certificateAddress??>${fjtEvaluation.certificateAddress!}<#else>${fjtEvaluation.address!}</#if> <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("号")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}号</#if>${fjtEvaluation.roomNum!}室</small> <a href="../district/weXinList?cityName=${fjtEvaluation.city!}" class="collectionLink" style="line-height: 32px;">重新评估 ></a></p>
|
||||
<p style="color: #F4A460;font-size: 12px;line-height: 20px;margin-top: -5px;margin-left: 20px;">*请确认与产证地址一致</p>
|
||||
<span></span>
|
||||
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0 && bohaiEvaluationAudit.inquirePrice gt 0>
|
||||
<p style="margin-top:14px;">评估总价:<#if fjtEvaluation??><strong class="<#if bohaiEvaluationAudit?? && (bohaiEvaluationAudit.lastPrice?? || bohaiEvaluationAudit.inquirePrice??)>price_final</#if>"><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?int}</#if></strong> 万元</#if></p>
|
||||
<p style="margin-top:14px;">评估总价:<#if fjtEvaluation??><strong class="<#if bohaiEvaluationAudit?? && (bohaiEvaluationAudit.lastPrice?? || bohaiEvaluationAudit.inquirePrice??)>price_final</#if>"><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?string('0.##')}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?string('0.##')}</#if></strong> 万元</#if></p>
|
||||
<p>评估单价:<#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/fjtEvaluation.houseArea)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/fjtEvaluation.houseArea)?int}</#if> 元/平米</p>
|
||||
<#if role?? && role==17 && loanInfoMap??>
|
||||
<p style="margin-top:-12px;">所属分类:${loanInfoMap.type!}类</p>
|
||||
@@ -71,15 +71,15 @@
|
||||
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.lastPrice??>
|
||||
<div class="topic inputTopic01" id="inputTopic01c">
|
||||
<div class="topicTitle topicTitle01">
|
||||
<span>审核价:<strong class="price_final">${(bohaiEvaluationAudit.lastPrice!/10000)?int}</strong> 万元</span><br>
|
||||
<span style="display:block;margin-top:-10px;">期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?int} 万元</span>
|
||||
<span>审核价:<strong class="price_final">${(bohaiEvaluationAudit.lastPrice!/10000)?string('0.##')}</strong> 万元</span><br>
|
||||
<span style="display:block;margin-top:-10px;">期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?string('0.##')} 万元</span>
|
||||
</div>
|
||||
</div>
|
||||
<#else>
|
||||
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.hopePrice??>
|
||||
<div class="topic inputTopic01" id="inputTopic01b">
|
||||
<div class="topicTitle topicTitle01">
|
||||
<span>期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?int} 万元</span>
|
||||
<span>期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?string('0.##')} 万元</span>
|
||||
<a class="submit_btn" id="refreshbhPrice">刷新</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -499,23 +499,10 @@
|
||||
contentType: false,
|
||||
processData: false,
|
||||
success: function (data) {
|
||||
if(data == null){
|
||||
|
||||
if(data.msg && data.msg.indexOf("成功")>-1){
|
||||
alert("上传成功");
|
||||
window.location.reload();
|
||||
// $("#file_wrap_list").remove();
|
||||
// var boxes = $("input[name=reportFiles]")
|
||||
// if(boxes.length>1){
|
||||
// var i = 0;
|
||||
// boxes.forEach(function(element) {
|
||||
// i++;
|
||||
// if(i>2){
|
||||
// element.remove();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// $("a.create-actions08").empty().text("请选择类型")
|
||||
// $("#fileClass").val("")
|
||||
// $("a.create-actions08").removeClass("selected")
|
||||
}else{
|
||||
alert(data.msg);
|
||||
}
|
||||
|
||||
@@ -171,6 +171,11 @@
|
||||
<artifactId>ojdbc14</artifactId>
|
||||
<version>10.2.0.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>42.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.yahoo.platform.yui</groupId>
|
||||
<artifactId>yuicompressor</artifactId>
|
||||
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package com.fangjia.script.ccbevaluation
|
||||
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import groovy.sql.Sql
|
||||
import org.bson.types.ObjectId
|
||||
|
||||
class AddThirdPartyPrice {
|
||||
|
||||
public static def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
|
||||
static main(args) {
|
||||
def task = new AddThirdPartyPrice()
|
||||
task.run()
|
||||
}
|
||||
|
||||
def run(){
|
||||
//
|
||||
def citys = ["林芝","海西州","天门","大兴安岭","儋州","鹤岗","日喀则","吐鲁番", "阿勒泰","迪庆州","潜江","塔城","克孜勒苏","和田","嘉峪关"]
|
||||
def rows = []
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
for(def c : citys){
|
||||
println c +" "+cityCodeDatas.get(c)
|
||||
def dists = CcbCommonUtils.findAllDistrictByCity(c, "district", ["city", "region", "name","name_cat", "estate_type2","lng"])
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(c)
|
||||
def rets = createDate(dists, distCodeMap)
|
||||
println dists.size() +" "+rets.size()
|
||||
if(rets){
|
||||
rows.addAll(rets)
|
||||
}
|
||||
}
|
||||
|
||||
def fileName = "/home/goojia/ccb/BIGDATA_THIRD_PARTY_PRICE_GJ.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_THIRD_PARTY_PRICE_GJ.dat"
|
||||
}
|
||||
|
||||
def header = []
|
||||
FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false);
|
||||
}
|
||||
|
||||
def createDate(dists, distCodeMap){
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
|
||||
def results = []
|
||||
for(def d : dists){
|
||||
|
||||
def cityId = cityCodeDatas.get(d.city)
|
||||
def data = distCodeMap.get(d.region)
|
||||
def avgPrice = findGuidedPrice(cityId, d._id.toString())
|
||||
if(!avgPrice){
|
||||
def dbo = CommonDatautils.queryHouseCalutePrice(d.city, d.region, d.name, DateUtils.parseFromTightYYYYMMDD("2022-05-01"))
|
||||
if(dbo){
|
||||
avgPrice = dbo.avg_price
|
||||
}
|
||||
}
|
||||
if(avgPrice){
|
||||
def ret = []
|
||||
ret << new ObjectId().toString()
|
||||
ret << cityId
|
||||
ret << data.district_code
|
||||
ret << d._id.toString()
|
||||
ret << d.name
|
||||
ret << "18"
|
||||
ret << "21世纪"
|
||||
ret << 202209
|
||||
ret << avgPrice
|
||||
ret << ""
|
||||
ret << ""
|
||||
ret << DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd")
|
||||
results << ret
|
||||
}
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
|
||||
def findGuidedPrice(cityId, commid){
|
||||
def sql = "select avg_price from guided_price_gj where cityid='${cityId}' and commid='${commid}' and dealdate>=to_date('2022-01-01','yyyy-MM-dd')"
|
||||
def avg_price = null
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
avg_price = r.avg_price
|
||||
});
|
||||
return avg_price
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -23,7 +23,7 @@ class BigdataBuildingBatch extends BaseBatch{
|
||||
|
||||
@Override
|
||||
public void process(Object args) {
|
||||
def citys = CcbCommonUtils.citys_all;
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def rows = []
|
||||
def headers = []
|
||||
for (def city : citys) {
|
||||
@@ -36,7 +36,7 @@ class BigdataBuildingBatch extends BaseBatch{
|
||||
def distMap = getDistrictMap(city)
|
||||
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, buildingMap)
|
||||
println city + " " + rets.size()
|
||||
def fileName = "/home/goojia/ccb/bigdata_building_fjw.dat"
|
||||
def fileName = "/ccb/bigdata_building_fjw.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\bigdata_building_fjw.dat"
|
||||
}
|
||||
|
||||
+27
-33
@@ -8,6 +8,7 @@ import com.fangjia.script.Watcher
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.CcbCodeUtils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.gj.district.FangjiaClientUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
import com.fangjia.script.util.OpenApiClient
|
||||
@@ -27,7 +28,7 @@ import java.util.regex.Pattern
|
||||
@BatchOwner(Watcher.GaoJuan)
|
||||
class BigdataCommunityBatch extends BaseBatch{
|
||||
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20)
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10)
|
||||
|
||||
static main(args) {
|
||||
runBatch(new BigdataCommunityBatch(), args);
|
||||
@@ -35,7 +36,7 @@ class BigdataCommunityBatch extends BaseBatch{
|
||||
|
||||
@Override
|
||||
public void process(Object args) {
|
||||
def citys = CcbCommonUtils.citys_92;
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
|
||||
def rows = []
|
||||
|
||||
@@ -50,7 +51,7 @@ class BigdataCommunityBatch extends BaseBatch{
|
||||
|
||||
index ++
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||
def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat"])
|
||||
def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"])
|
||||
|
||||
def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city))
|
||||
def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists)
|
||||
@@ -107,7 +108,6 @@ class BigdataCommunityBatch extends BaseBatch{
|
||||
if(ret){
|
||||
rets << ret
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
@@ -175,38 +175,33 @@ class BigdataCommunityBatch extends BaseBatch{
|
||||
ret << "pa101"
|
||||
ret << ""
|
||||
if(dist.address){
|
||||
if(dist.address.toString().contains("Ū")){
|
||||
String number = DataUtil.match(dist.address, Pattern.compile("\\d+Ū"))
|
||||
if(number){
|
||||
ret << dist.address.toString().substring(0, dist.address.toString().indexOf(number))
|
||||
ret << dist.address.toString().substring(dist.address.toString().indexOf(number), dist.address.toString().size())
|
||||
if(dist.street){
|
||||
ret << dist.street
|
||||
if(dist.street_number){
|
||||
ret << dist.street_number
|
||||
}else{
|
||||
ret << ""
|
||||
ret << ""
|
||||
}
|
||||
}else{
|
||||
def jsonObj = null
|
||||
if(dist.address){
|
||||
// jsonObj = OpenApiClient.addressMatch(dist.city, dist.address, "property", false, dist.region, dist.name)
|
||||
jsonObj = OpenApiClient.standard1Action(dist.city, dist.address)
|
||||
}
|
||||
if(jsonObj && jsonObj.street){
|
||||
if(jsonObj.street){
|
||||
ret << jsonObj.street
|
||||
}else{
|
||||
ret << ""
|
||||
}
|
||||
|
||||
if(jsonObj.streetNumber){
|
||||
ret << jsonObj.streetNumber
|
||||
}else{
|
||||
ret << ""
|
||||
}
|
||||
|
||||
}else{
|
||||
ret << ""
|
||||
ret << ""
|
||||
}
|
||||
ret << ""
|
||||
ret << ""
|
||||
// def jsonObj = FangjiaClientUtils.addressStructure(dist.city, dist.address)
|
||||
// if(jsonObj && jsonObj.result && jsonObj.result.street){
|
||||
// if(jsonObj.result.street){
|
||||
// ret << jsonObj.result.street
|
||||
// }else{
|
||||
// ret << ""
|
||||
// }
|
||||
//
|
||||
// if(jsonObj.result.streetNumber){
|
||||
// ret << jsonObj.result.streetNumber
|
||||
// }else{
|
||||
// ret << ""
|
||||
// }
|
||||
// }else{
|
||||
// ret << ""
|
||||
// ret << ""
|
||||
// }
|
||||
}
|
||||
}else{
|
||||
ret << ""
|
||||
@@ -225,7 +220,6 @@ class BigdataCommunityBatch extends BaseBatch{
|
||||
println dist.city + " "+dist.name+" error"
|
||||
e.printStackTrace()
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
+44
-24
@@ -33,8 +33,8 @@ import java.util.regex.Pattern
|
||||
@BatchOwner(Watcher.GaoJuan)
|
||||
class BigdataDealBatch extends BaseBatch{
|
||||
|
||||
// def startDate = 202206
|
||||
// def endDate = 202208
|
||||
def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM"));
|
||||
def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
|
||||
def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd"));
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30)
|
||||
@@ -63,11 +63,12 @@ class BigdataDealBatch extends BaseBatch{
|
||||
curDate = args[1].toString().toInteger()
|
||||
}
|
||||
|
||||
// for(def city : citys){
|
||||
//// if(!ccbCitys.contains(city)){
|
||||
// addDealPriceMatch(city);
|
||||
//// }
|
||||
// }
|
||||
println "curDate:"+curDate
|
||||
for(def city : citys){
|
||||
// if(!ccbCitys.contains(city)){
|
||||
addDealPriceMatch(city);
|
||||
// }
|
||||
}
|
||||
def rows = []
|
||||
def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"]
|
||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
@@ -85,15 +86,17 @@ class BigdataDealBatch extends BaseBatch{
|
||||
println city +" "+youdaDatas.size()
|
||||
}
|
||||
|
||||
|
||||
def trades = getCityData(city, statMap, ppeDists)
|
||||
def rets = createData(trades, cityCodeDataMap, distCodeMap, "other")
|
||||
rows.addAll(rets)
|
||||
println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size()
|
||||
if(trades){
|
||||
def rets = createData(trades, cityCodeDataMap, distCodeMap, "other")
|
||||
rows.addAll(rets)
|
||||
println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size()
|
||||
|
||||
def cityDatas = []
|
||||
cityDatas << headers
|
||||
cityDatas.addAll(rows)
|
||||
}
|
||||
|
||||
def cityDatas = []
|
||||
cityDatas << headers
|
||||
cityDatas.addAll(rows)
|
||||
}
|
||||
|
||||
def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat"
|
||||
@@ -101,7 +104,7 @@ class BigdataDealBatch extends BaseBatch{
|
||||
fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat"
|
||||
}
|
||||
|
||||
FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", true);
|
||||
FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false);
|
||||
println "txt 生成 " + rows.size()
|
||||
}
|
||||
|
||||
@@ -111,8 +114,10 @@ class BigdataDealBatch extends BaseBatch{
|
||||
final CountDownLatch latch = new CountDownLatch(rets.size())
|
||||
|
||||
// def lianjiaPriceMap = findThirdPartyPrice("上海")
|
||||
def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd')
|
||||
def lianjiaPriceMap = getDistrictStatByCity("ÉϺ£", startDate)
|
||||
// def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd')
|
||||
// def lianjiaPriceMap = getDistrictStatByCity("ÉϺ£", startDate)
|
||||
|
||||
def ccbPriceMap = getCommunityPrices("ÉϺ£")
|
||||
for(def i=0;i<rets.size();i++){
|
||||
final def trade = rets[i]
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
@@ -121,7 +126,7 @@ class BigdataDealBatch extends BaseBatch{
|
||||
totalCount.addAndGet(1)
|
||||
if(source == "youda"){
|
||||
|
||||
def ret = converYouDaData(trade, cityCodeDatas, distCodeMap, lianjiaPriceMap)
|
||||
def ret = converYouDaData(trade, cityCodeDatas, distCodeMap, ccbPriceMap)
|
||||
if(ret){
|
||||
result << ret
|
||||
println totalCount.get() +" "+trade.city+" "+trade.region+" "+trade.fjName+" "+new Date().toLocaleString()
|
||||
@@ -147,6 +152,21 @@ class BigdataDealBatch extends BaseBatch{
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
def getCommunityPrices(def city){
|
||||
def sql = "select commid, avg_price from community_base_price_gj where year_month=${endDate} and cityname='${city}'";
|
||||
def map = [:]
|
||||
try{
|
||||
sqlInstance.eachRow(sql,{
|
||||
map.put(it.commid, it.avg_price)
|
||||
});
|
||||
}catch(Exception e){
|
||||
getPpeGTE15Datas(city)
|
||||
}
|
||||
|
||||
return map
|
||||
}
|
||||
|
||||
def findThirdPartyPrice(def city) {
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
@@ -170,13 +190,13 @@ class BigdataDealBatch extends BaseBatch{
|
||||
return map
|
||||
}
|
||||
|
||||
def converYouDaData(def trade, def cityCodeDatas, def distCodeMap, def lianjiaPriceMap){
|
||||
def converYouDaData(def trade, def cityCodeDatas, def distCodeMap, def ccbPriceMap){
|
||||
def ret = []
|
||||
def obj = CcbCommonUtils.findDistrict(trade.fjCity, trade.fjRegion, trade.fjName, "district")
|
||||
if(!obj){
|
||||
return ret;
|
||||
}
|
||||
def price = lianjiaPriceMap.get(obj.region+"##"+obj.name)
|
||||
def price = ccbPriceMap.get(obj._id.toString())
|
||||
if(price){
|
||||
def mod = java.lang.Math.abs((trade.price-price)*100/price)
|
||||
if(mod<=10){
|
||||
@@ -613,10 +633,10 @@ class BigdataDealBatch extends BaseBatch{
|
||||
|
||||
|
||||
def addDealPriceMatch(city){
|
||||
// def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||
// def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||
def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern("20210101", "yyyyMMdd"))
|
||||
def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern("20221001", "yyyyMMdd"))
|
||||
def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||
def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern(curDate.toString(), "yyyyMMdd"))
|
||||
// def startDate = DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightByPattern("20210101", "yyyyMMdd"))
|
||||
// def endDate = DateUtils.getLastDayOfMonth(DateUtils.parseFromTightByPattern("20221001", "yyyyMMdd"))
|
||||
def trades = CcbCommonUtils.findTradesByMonth(city, startDate, endDate)
|
||||
|
||||
final CountDownLatch latch = new CountDownLatch(trades.size())
|
||||
|
||||
+210
-8
@@ -68,14 +68,14 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
public void process(Object args) {
|
||||
def index = 0
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
statCity(citys)
|
||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
for(def city : citys){
|
||||
index++
|
||||
// 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, 20220918, 20221019);
|
||||
exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20221218, 20230119);
|
||||
// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20210901, 20221119);
|
||||
// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20211001, 20221011);
|
||||
// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20210801, 20210831);
|
||||
//测试通过匹配接口配房源效果
|
||||
@@ -429,6 +429,13 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
|
||||
def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){
|
||||
|
||||
def rets1 = findHousesByPdate(city, region, cat, startDate, endDate, name, alias, estate_type2)
|
||||
def rets2 = findHousesByMdate(city, region, cat, startDate, endDate, name, alias, estate_type2, rets1)
|
||||
rets1.addAll(rets2)
|
||||
return rets1;
|
||||
}
|
||||
|
||||
def findHousesByPdate(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){
|
||||
QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(false).includeUpper(false);
|
||||
QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false);
|
||||
|
||||
@@ -448,7 +455,6 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
if(!alias.contains(newName)){
|
||||
alias << newName
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(alias && alias.size()>0){
|
||||
@@ -478,8 +484,14 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type
|
||||
continue;
|
||||
}
|
||||
|
||||
def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
|
||||
if(vallaFlag){
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(!seawater.total_price){
|
||||
continue;
|
||||
}
|
||||
@@ -539,11 +551,203 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
if(floor && floor.toInteger()<1){
|
||||
floor = null
|
||||
}
|
||||
def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
|
||||
if(vallaFlag){
|
||||
|
||||
def rowMap = [:];
|
||||
if(cat == "rent"){
|
||||
rowMap.rent_type = seawater.rent_type
|
||||
if(seawater.avg_price && seawater.avg_price>1000){
|
||||
continue
|
||||
}
|
||||
|
||||
if(seawater.avg_price && seawater.avg_price<10){
|
||||
continue
|
||||
}
|
||||
|
||||
}
|
||||
rowMap.houseId = seawater.id
|
||||
rowMap.city = CcbCommonUtils.getCcbCity(city)
|
||||
//rowMap.region =seawater.region
|
||||
//rowMap.address = seawater.address
|
||||
|
||||
|
||||
rowMap.area = seawater.area
|
||||
rowMap.total_price = seawater.total_price
|
||||
rowMap.avg_price = seawater.avg_price
|
||||
rowMap.height = seawater.height=="null"?null:seawater.height
|
||||
if(rowMap.height && rowMap.height<1){
|
||||
rowMap.height = null
|
||||
}
|
||||
rowMap.floor = floor=="null"?null:floor
|
||||
rowMap.room = seawater.room=="null"?null:seawater.room
|
||||
rowMap.hall = seawater.hall=="null"?null:seawater.hall
|
||||
rowMap.toilet = seawater.toilet=="null"?null:seawater.toilet
|
||||
if(CcbCommonUtils.rootMap.get(seawater.root)){
|
||||
rowMap.root = CcbCommonUtils.rootMap.get(seawater.root)
|
||||
}else{
|
||||
rowMap.root = "99"
|
||||
}
|
||||
|
||||
def direction = parseDirection(seawater.direction)
|
||||
rowMap.direction = direction=="null"?null:direction
|
||||
|
||||
def fitment = parseFitment(seawater.fitment)
|
||||
rowMap.fitment = fitment=="null"?null:fitment
|
||||
|
||||
if(seawater.p_date instanceof String){
|
||||
seawater.p_date = seawater.p_date.toInteger()
|
||||
}
|
||||
if(seawater.p_date<=20200101){
|
||||
//seawater.p_date.toString().replace("2019","2020")//
|
||||
rowMap.p_date = DateUtils.getRandomDate("2020-01-01", "2020-07-31")
|
||||
rowMap.c_date = rowMap.p_date
|
||||
rowMap.m_date = rowMap.p_date
|
||||
}else{
|
||||
rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss")
|
||||
rowMap.c_date = DateUtils.getConverDate(seawater.m_date)
|
||||
rowMap.m_date = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-18 10:00:00"//DateUtils.getConverDate(seawater.m_date)
|
||||
}
|
||||
|
||||
rets << rowMap
|
||||
}
|
||||
}
|
||||
|
||||
println name +" "+houses.size()+" last:"+rets.size()
|
||||
return rets;
|
||||
}
|
||||
|
||||
|
||||
def findHousesByMdate(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2, rets1){
|
||||
def date = DateUtils.addMonth(endDate.toString(), -3, "yyyyMMdd")
|
||||
def startMdate = DateUtils.parseFromTightByPattern(date,"yyyyMMdd")
|
||||
def endMdate = DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd")
|
||||
|
||||
QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(date.toInteger()).to(endDate).includeLower(false).includeUpper(false);
|
||||
QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false);
|
||||
|
||||
|
||||
QueryBuilder date_range_mdate = QueryBuilders.rangeQuery("m_date").from(startMdate.getTime()).to(endMdate.getTime()).includeLower(true).includeUpper(false);
|
||||
|
||||
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat))
|
||||
.must(date_range).must(area_range).must(date_range_mdate)
|
||||
|
||||
if(!alias){
|
||||
alias = []
|
||||
}
|
||||
if(!alias.contains(name)){
|
||||
alias.add(name)
|
||||
}
|
||||
|
||||
|
||||
if(name.contains("弄小区")){
|
||||
def newName = name.replace("弄小区","弄")
|
||||
if(!alias.contains(newName)){
|
||||
alias << newName
|
||||
}
|
||||
}
|
||||
|
||||
if(alias && alias.size()>0){
|
||||
BoolQueryBuilder inBuilder = QueryBuilders.boolQuery();
|
||||
for(def s : alias){
|
||||
inBuilder.should(QueryBuilders.matchQuery("district_name", s));
|
||||
}
|
||||
queryBuilder.must(inBuilder)
|
||||
}
|
||||
|
||||
|
||||
def rets = []
|
||||
def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
|
||||
|
||||
if(houses){
|
||||
|
||||
def ids = new HashSet()
|
||||
for(def h : rets1){
|
||||
ids << h.houseId
|
||||
}
|
||||
for (int k=0;k<houses.size();k++) {
|
||||
def map = houses[k];
|
||||
DBObject seawater = new BasicDBObject(map)
|
||||
if(ids && ids.contains(seawater.id)){
|
||||
continue;
|
||||
}
|
||||
|
||||
if(estate_type2 && estate_type2=="普通住宅"){
|
||||
if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){
|
||||
println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type
|
||||
continue;
|
||||
}
|
||||
|
||||
if(seawater.estate_type&& seawater.estate_type.contains("别墅")){
|
||||
println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type
|
||||
continue;
|
||||
}
|
||||
|
||||
def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
|
||||
if(vallaFlag){
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(!seawater.total_price){
|
||||
continue;
|
||||
}
|
||||
if(!seawater.avg_price){
|
||||
continue;
|
||||
}
|
||||
|
||||
if(!seawater.height){
|
||||
seawater.height = null
|
||||
}
|
||||
// if(seawater.height && seawater.height<1){
|
||||
// continue;
|
||||
// }
|
||||
if(seawater.height && seawater.height>60){
|
||||
continue;
|
||||
}
|
||||
|
||||
// if(!seawater.room){
|
||||
// continue;
|
||||
// }
|
||||
if(!seawater.room){
|
||||
seawater.room = null
|
||||
}
|
||||
|
||||
if(seawater.room){
|
||||
if(seawater.room>=11 || seawater.room<1){
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if(!seawater.hall){
|
||||
seawater.hall = null
|
||||
}
|
||||
if(seawater.hall && (seawater.hall>=5 || seawater.hall<1)){
|
||||
continue;
|
||||
}
|
||||
if(!seawater.toilet){
|
||||
seawater.toilet = null
|
||||
}
|
||||
if(seawater.toilet && (seawater.toilet>=5 || seawater.toilet<1)){
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
def floor = parseFloor(seawater.floor_info)
|
||||
if(seawater.height && floor && floor.isNumber()){
|
||||
if(floor.toInteger()>seawater.height){
|
||||
floor = null
|
||||
seawater.height = null
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(!floor){
|
||||
seawater.floor = null
|
||||
}
|
||||
if(floor && floor.toInteger()<1){
|
||||
floor = null
|
||||
}
|
||||
|
||||
def rowMap = [:];
|
||||
if(cat == "rent"){
|
||||
rowMap.rent_type = seawater.rent_type
|
||||
@@ -585,8 +789,6 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
def fitment = parseFitment(seawater.fitment)
|
||||
rowMap.fitment = fitment=="null"?null:fitment
|
||||
|
||||
|
||||
|
||||
if(seawater.p_date instanceof String){
|
||||
seawater.p_date = seawater.p_date.toInteger()
|
||||
}
|
||||
@@ -598,7 +800,7 @@ class BigdataForsaleBatch extends BaseBatch{
|
||||
}else{
|
||||
rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss")
|
||||
rowMap.c_date = DateUtils.getConverDate(seawater.m_date)
|
||||
rowMap.m_date = DateUtils.getConverDate(seawater.m_date)
|
||||
rowMap.m_date = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-18 10:00:00"//DateUtils.getConverDate(seawater.m_date)
|
||||
}
|
||||
|
||||
rets << rowMap
|
||||
|
||||
+16
-4
@@ -16,7 +16,7 @@ import groovy.sql.Sql
|
||||
class CcbCommonUtils {
|
||||
|
||||
//
|
||||
public static def citys_all = [ "长春","上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水","潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"]
|
||||
public static def citys_all = [ "上海","长春","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水","潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"]
|
||||
public static def citys_92 = [ "上海","扬州","北京","重庆","天津","成都","沈阳","大连","安庆","西宁","日照","长春","武汉","西安","苏州","广州","南京","青岛","济南","宁波","长沙","石家庄","佛山","嘉兴","银川","南通","廊坊","中山","郑州","哈尔滨","烟台","徐州","绍兴","厦门","昆明","南昌","贵阳","珠海","东莞","镇江","洛阳","温州","兰州","福州","惠州","呼和浩特","常州","唐山","淮安","湖州","九江","太原","北海","株洲","淄博","盐城","乌鲁木齐","海口","南宁","常德","台州","金华","吉林","岳阳","柳州","清远","湛江","张家口","保定","深圳","杭州","合肥","无锡","泉州","遵义","肇庆","漳州","宜昌","芜湖","泰州","汕头","三亚","秦皇岛","马鞍山","连云港","沧州","拉萨","锦州","大同","文昌","保亭","陵水"]
|
||||
public static def citys_252 = ["潍坊","临沂","邯郸","济宁","威海","绵阳","梅州","平顶山","江门","赣州","泰安","襄阳","南阳","桂林","聊城","临汾","德州","商丘","衡阳","宿迁","包头","渭南","咸阳","许昌","滨州","邢台","南充","安阳","新乡","枣庄","滁州","龙岩","宝鸡","信阳","运城","衡水","东营","晋中","孝感","长治","阜阳","韶关","菏泽","德阳","宁德","荆州","乐山","驻马店","南平","汉中","榆林","宜春","鞍山","开封","周口","绥化","湘潭","黄冈","承德","焦作","牡丹江","莆田","上饶","眉山","齐齐哈尔","郴州","营口","蚌埠","大庆","赤峰","河源","吕梁","遂宁","漯河","三明","茂名","濮阳","曲靖","平凉","鄂尔多斯","十堰","吉安","黄石","佳木斯","三门峡","揭阳","忻州","通辽","泸州","六安","潮州","衢州","淮南","荆门","永州","呼伦贝尔","葫芦岛","丹东","延边","宣城","宜宾","庆阳","晋城","阳江","宿州","延安","咸宁","怀化","黄山","舟山","汕尾","盘锦","朝阳","丽水","抚州","铁岭","红河","陇南","广安","抚顺","自贡","达州","玉林","玉溪","白银","亳州","邵阳","广元","昌吉","益阳","张掖","娄底","阳泉","天水","随州","朔州","大理","通化","楚雄","巴彦淖尔","乌兰察布","新余","景德镇","松原","辽阳","阜新","酒泉","黔南","淮北","四平","梧州","黔东南","巴中","鹤壁","鸡西","内江","钦州","池州","仙桃","恩施","本溪","资阳","六盘水","百色","白城","临夏","伊犁","贵港","白山","双鸭山","吴忠","鄂州","丽江","安康","毕节","云浮","巴音郭楞","安顺","阿克苏","黑河","铜陵","雅安","石嘴山","萍乡","鹤岗","锡林郭勒盟","铜仁","防城港","喀什","兴安盟","河池","铜川","普洱","保山","凉山州","鹰潭","定西","伊春","中卫","黔西南","商洛","乌海","武威","海西州","来宾","昭通","湘西","哈密","张家界","西双版纳州","七台河","固原","攀枝花","德宏州","崇左","辽源","嘉峪关","克拉玛依","临沧","潜江","贺州","天门","海东","塔城","儋州","金昌","博尔塔拉","吐鲁番","大兴安岭","阿勒泰","和田","迪庆州","日喀则","林芝","阿坝州","阿拉善盟","阿里","昌都","甘南","甘孜州","果洛州","海北州","海南州","黄南州","克孜勒苏","那曲","怒江州","三沙","山南","神农架","文山州","玉树州"]
|
||||
|
||||
@@ -42,8 +42,7 @@ class CcbCommonUtils {
|
||||
|
||||
public static DSCollection dataStoreConnection = null;
|
||||
|
||||
public static def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
public static def sqlInstance = null
|
||||
|
||||
|
||||
public static def getRunningCitys(def args){
|
||||
@@ -53,13 +52,21 @@ class CcbCommonUtils {
|
||||
def countStr = args[0]
|
||||
if(countStr=="344"){
|
||||
citys = CcbCommonUtils.citys_all
|
||||
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
}else if(countStr=="92"){
|
||||
citys = CcbCommonUtils.citys_92
|
||||
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
}else if(countStr=="252"){
|
||||
citys = CcbCommonUtils.citys_252
|
||||
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
}
|
||||
}else{
|
||||
citys = CcbCommonUtils.citys_92
|
||||
sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
}
|
||||
println "运行城市数量:"+citys.size()
|
||||
return citys;
|
||||
@@ -417,7 +424,7 @@ class CcbCommonUtils {
|
||||
q.put("visible",0)
|
||||
q.put("cat", cat);
|
||||
q.put("city", city);
|
||||
// q.put("name","云山尚城")
|
||||
// q.put("name","鸣翠蓝湾")
|
||||
// q.put("name_cat", 0);
|
||||
// q.put("estate_type2", new BasicDBObject('$in', ["普通住宅","商住"]))
|
||||
|
||||
@@ -562,4 +569,9 @@ class CcbCommonUtils {
|
||||
return maxSeqno
|
||||
}
|
||||
|
||||
public static def deleteGuidedPrice(def dealdate){
|
||||
def sql = "delete from guided_price_gj where dealdate=to_date('${dealdate}','yyyy-mm-dd')"
|
||||
sqlInstance.executeUpdate(sql)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+29
-3
@@ -7,13 +7,13 @@ import org.apache.commons.codec.digest.DigestUtils
|
||||
|
||||
class CcbFtpTestUtils {
|
||||
|
||||
static def ftpServer = "192.168.0.86"
|
||||
static def ftpServer = "192.168.0.86"//45
|
||||
static def ftpPort = 17495
|
||||
static def ftpUser = "ccb"
|
||||
static def ftpPassword = "ccb!@#"
|
||||
static def ftpPath = "/home/ccb/output/"
|
||||
static def ftpPath = "/home/ccb_evaluation/output/"
|
||||
|
||||
static def ftpPath_rh = "/home/ccb_rh/output/"
|
||||
static def ftpPath_rh = "/home/ccb_ronghe/output/"
|
||||
|
||||
static SFTP sftp = new SFTP();
|
||||
static ChannelSftp sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword);
|
||||
@@ -70,6 +70,32 @@ class CcbFtpTestUtils {
|
||||
}
|
||||
|
||||
|
||||
static def listFileNames(type, month){
|
||||
//ÉÏ´«µ½ftp
|
||||
sftpChannel = reConnect();
|
||||
Vector files = null;
|
||||
if(type && type=="rh"){
|
||||
files = sftp.listFiles(ftpPath_rh+ month+"/", sftpChannel);
|
||||
}else{
|
||||
files = sftp.listFiles(ftpPath+ month+"/", sftpChannel);
|
||||
}
|
||||
return files
|
||||
}
|
||||
|
||||
static def getFileLength(String type, String path, String month){
|
||||
sftpChannel = reConnect();
|
||||
def size = 0;
|
||||
if(type && type=="rh"){
|
||||
size = sftp.getFileSize(ftpPath_rh+ month+"/"+path, sftpChannel)
|
||||
}else{
|
||||
size = sftp.getFileSize(ftpPath+ month+"/"+path, sftpChannel)
|
||||
}
|
||||
return size
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static main(args) {
|
||||
|
||||
|
||||
|
||||
+8
@@ -3,6 +3,7 @@ package com.fangjia.script.ccbevaluation
|
||||
import com.fangjia.script.common.DataHandleUtils
|
||||
import com.fangjia.script.jiangnanblank.SFTP
|
||||
import com.jcraft.jsch.ChannelSftp
|
||||
import com.jcraft.jsch.SftpATTRS
|
||||
import org.apache.commons.codec.digest.DigestUtils
|
||||
|
||||
class CcbFtpUtils {
|
||||
@@ -64,6 +65,13 @@ class CcbFtpUtils {
|
||||
return files
|
||||
}
|
||||
|
||||
static def getFileLength(String path, String month){
|
||||
sftpChannel = reConnect();
|
||||
def size = sftp.getFileSize(ftpPath+ month+"/"+path, sftpChannel)
|
||||
return size
|
||||
}
|
||||
|
||||
|
||||
static main(args) {
|
||||
|
||||
|
||||
|
||||
+39
-4
@@ -25,8 +25,9 @@ class DealPriceDataProcess {
|
||||
def task = new DealPriceDataProcess()
|
||||
// task.process()//运当成交pe值不好时行,拉升成交价格及删除pe太大数据
|
||||
// task.addLianJiaPrice();
|
||||
task.deleteThirdPartyData()
|
||||
// task.deleteThirdPartyData()
|
||||
// task.delDealByPe()
|
||||
task.delDealData()
|
||||
}
|
||||
|
||||
def delDealByPe(){
|
||||
@@ -370,20 +371,33 @@ class DealPriceDataProcess {
|
||||
|
||||
|
||||
def deleteThirdPartyData(){
|
||||
def citys = CcbCommonUtils.citys_92
|
||||
def month = 202209
|
||||
def citys = CcbCommonUtils.citys_all
|
||||
def month = 202211
|
||||
def rows = []
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
def set = new HashSet()
|
||||
for(def city : citys) {
|
||||
def rets = findPeGteThirdParty(city, 202210)
|
||||
def rets = findPeGteThirdParty(city, 202212)
|
||||
def total = 0
|
||||
println city +" "+rets.size()
|
||||
if(rets){
|
||||
set.add(city)
|
||||
}
|
||||
for(def m : rets){
|
||||
def cityId = cityCodeDatas.get(city)
|
||||
def sql = "delete from BIGDATA_THIRD_PARTY_PRICE_GJ where cityid='${cityId}' and commid='${m.commid}' and price_date=${month} and community_price=${m.price}"
|
||||
sqlInstance236.executeUpdate(sql)
|
||||
}
|
||||
}
|
||||
println set.toString()
|
||||
}
|
||||
|
||||
def findThirdCount(sqlInstance236, sql){
|
||||
def count = 0
|
||||
sqlInstance236.eachRow(sql,{r->
|
||||
count = r.count()
|
||||
});
|
||||
return count
|
||||
}
|
||||
|
||||
def findPeGteThirdParty(cityName, yearmonth){
|
||||
@@ -398,4 +412,25 @@ class DealPriceDataProcess {
|
||||
return rets
|
||||
}
|
||||
|
||||
def delDealData(){
|
||||
ExcelUtils.modify("D:\\数据\\建行\\房产估值\\成交\\杭州成交删除12-23.xlsx", { d ->
|
||||
if(d['A']){
|
||||
def count = delDealDataByid(d['A'],d['K'].toString().toDouble(), d['H'].toString().toDouble().toInteger())
|
||||
println d['B']+" "+count
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
def delDealDataByid(commid, area, price){
|
||||
def sql = "select count(*) as count from bigdata_deal_gj where commid='${commid}' and buildarea=${area} and DEALUNITPRICE=${price} " +
|
||||
"and dealdate>=TO_DATE('2022-11-01','yyyy-MM-dd')"
|
||||
// sqlInstance236.executeUpdate(sql)
|
||||
def count = 0
|
||||
sqlInstance236.eachRow(sql,{r->
|
||||
count = r.count
|
||||
});
|
||||
return count
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+1200
File diff suppressed because it is too large
Load Diff
+8
-8
@@ -25,11 +25,11 @@ class ExportOracleData {
|
||||
|
||||
def run(args) {
|
||||
citys = CcbCommonUtils.getRunningCitys(args)
|
||||
// def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
|
||||
def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
|
||||
def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM")
|
||||
def new_dists = []
|
||||
//不会变
|
||||
//不会变 10.25
|
||||
exportEvaluationRateData()
|
||||
exportBigdataPoiData()//
|
||||
exportBigdataDistrictData()//
|
||||
@@ -48,9 +48,9 @@ class ExportOracleData {
|
||||
|
||||
//µÚÈý·½ÍøÕ¾È¨Öرí
|
||||
exportWebsiteRate();
|
||||
|
||||
|
||||
//计算结果相关
|
||||
//
|
||||
//
|
||||
// //计算结果相关
|
||||
// exportAvmEvaluationGJNB(curMonth)
|
||||
// exportAVMEvaluationItemGJNB(curMonth)
|
||||
//
|
||||
@@ -62,11 +62,11 @@ class ExportOracleData {
|
||||
//
|
||||
// exportCommunityPdescribeGj(curMonth)
|
||||
// exportCommCaseDetailGj(curMonth)
|
||||
|
||||
//
|
||||
// def curDate = curMonth.toString()+"28"
|
||||
// SSHHelper jschCommand = new SSHHelper();
|
||||
// System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
|
||||
//ok文件
|
||||
//// ok文件
|
||||
// exportLastFile()
|
||||
}
|
||||
|
||||
@@ -377,7 +377,7 @@ class ExportOracleData {
|
||||
"HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" +
|
||||
"PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" +
|
||||
"from bigdata_deal_gj where CITYID='${cityCode}' and dealdate>=to_date('${dealDate}','yyyy-MM-dd')";
|
||||
allRows = dealData(sql)
|
||||
allRows.addAll(dealData(sql))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1171
File diff suppressed because it is too large
Load Diff
+235
-211
@@ -12,13 +12,16 @@ class ExportOracleEvaluationData {
|
||||
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
|
||||
def citys = null
|
||||
def cityCodeMap = CcbCommonUtils.findCityCodeValue()
|
||||
|
||||
static main(args) {
|
||||
def task = new ExportOracleEvaluationData()
|
||||
task.run()
|
||||
task.run(args)
|
||||
}
|
||||
|
||||
def run() {
|
||||
|
||||
def run(args) {
|
||||
citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
|
||||
|
||||
//计算结果相关
|
||||
@@ -44,49 +47,53 @@ class ExportOracleEvaluationData {
|
||||
}
|
||||
|
||||
def exportAvmEvaluationGJNB(yearMonth){
|
||||
def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" +
|
||||
"ANN_CALC_NUM, ANN_CALC_COVERAGE, TEST_NUM, TEST_COMM_NUM, TEST_COMM_COVERAGE, PPE15_COVERAGE, RATE_MEDIAN, COEFFICIENT,DEAL_TEST_CASE_NUM, DEAL_TEST_COMM_NUM, DEAL_TEST_COMM_COVERAGE, DEAL_PPE15_COVERAGE, \n" +
|
||||
"DEAL_COEFFICIENT, DEAL_RATE_MEDIAN, THIRD_TEST_CASE_NUM, THIRD_TEST_COMM_NUM, THIRD_TEST_COMM_COVERAGE, THIRD_PPE15_COVERAGE, THIRD_COEFFICIENT, THIRD_RATE_MEDIAN, \n" +
|
||||
"to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from avm_evaluation_gj where YEAR_MONTH = ${yearMonth}";
|
||||
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.COMMUNITY_NUM
|
||||
data << r.HAS_PRICE_COMMUNITY_NUM
|
||||
data << r.PRICE_COVERAGE
|
||||
data << r.ARTIFICIAL_CALC_NUM
|
||||
data << r.ARTIFICIAL_CALC_COVERAGE
|
||||
data << r.SAMPLE_CALC_NUM
|
||||
data << r.SAMPLE_CALC_COVERAGE
|
||||
data << r.ANN_CALC_NUM
|
||||
data << r.ANN_CALC_COVERAGE
|
||||
data << r.TEST_NUM
|
||||
data << r.TEST_COMM_NUM
|
||||
data << r.TEST_COMM_COVERAGE
|
||||
data << r.PPE15_COVERAGE
|
||||
data << r.RATE_MEDIAN
|
||||
data << r.COEFFICIENT
|
||||
data << r.DEAL_TEST_CASE_NUM
|
||||
data << r.DEAL_TEST_COMM_NUM
|
||||
data << r.DEAL_TEST_COMM_COVERAGE
|
||||
data << r.DEAL_PPE15_COVERAGE
|
||||
data << r.DEAL_COEFFICIENT
|
||||
data << r.DEAL_RATE_MEDIAN
|
||||
data << r.THIRD_TEST_CASE_NUM
|
||||
data << r.THIRD_TEST_COMM_NUM
|
||||
data << r.THIRD_TEST_COMM_COVERAGE
|
||||
data << r.THIRD_PPE15_COVERAGE
|
||||
data << r.THIRD_COEFFICIENT
|
||||
data << r.THIRD_RATE_MEDIAN
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" +
|
||||
"ANN_CALC_NUM, ANN_CALC_COVERAGE, TEST_NUM, TEST_COMM_NUM, TEST_COMM_COVERAGE, PPE15_COVERAGE, RATE_MEDIAN, COEFFICIENT,DEAL_TEST_CASE_NUM, DEAL_TEST_COMM_NUM, DEAL_TEST_COMM_COVERAGE, DEAL_PPE15_COVERAGE, \n" +
|
||||
"DEAL_COEFFICIENT, DEAL_RATE_MEDIAN, THIRD_TEST_CASE_NUM, THIRD_TEST_COMM_NUM, THIRD_TEST_COMM_COVERAGE, THIRD_PPE15_COVERAGE, THIRD_COEFFICIENT, THIRD_RATE_MEDIAN, \n" +
|
||||
"to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from avm_evaluation_gj where YEAR_MONTH = ${yearMonth} and CITYID='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.COMMUNITY_NUM
|
||||
data << r.HAS_PRICE_COMMUNITY_NUM
|
||||
data << r.PRICE_COVERAGE
|
||||
data << r.ARTIFICIAL_CALC_NUM
|
||||
data << r.ARTIFICIAL_CALC_COVERAGE
|
||||
data << r.SAMPLE_CALC_NUM
|
||||
data << r.SAMPLE_CALC_COVERAGE
|
||||
data << r.ANN_CALC_NUM
|
||||
data << r.ANN_CALC_COVERAGE
|
||||
data << r.TEST_NUM
|
||||
data << r.TEST_COMM_NUM
|
||||
data << r.TEST_COMM_COVERAGE
|
||||
data << r.PPE15_COVERAGE
|
||||
data << r.RATE_MEDIAN
|
||||
data << r.COEFFICIENT
|
||||
data << r.DEAL_TEST_CASE_NUM
|
||||
data << r.DEAL_TEST_COMM_NUM
|
||||
data << r.DEAL_TEST_COMM_COVERAGE
|
||||
data << r.DEAL_PPE15_COVERAGE
|
||||
data << r.DEAL_COEFFICIENT
|
||||
data << r.DEAL_RATE_MEDIAN
|
||||
data << r.THIRD_TEST_CASE_NUM
|
||||
data << r.THIRD_TEST_COMM_NUM
|
||||
data << r.THIRD_TEST_COMM_COVERAGE
|
||||
data << r.THIRD_PPE15_COVERAGE
|
||||
data << r.THIRD_COEFFICIENT
|
||||
data << r.THIRD_RATE_MEDIAN
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
|
||||
def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
|
||||
@@ -107,38 +114,43 @@ class ExportOracleEvaluationData {
|
||||
}
|
||||
|
||||
def exportAVMEvaluationItemGJNB(yearMonth){
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, CONFIDENCE,TARGET_AVG_PRICE, \n" +
|
||||
"to_char(DEALDATE,'yyyy-mm-dd hh24:mi:ss') as DEALDATE, UNIT_PRICE, BUILDAREA, FITMENT, HOUSEASPECT, FLOORNUM, FLOORCNT, DATA_TYPE, RATE, PE, \n" +
|
||||
"to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME from avm_evaluation_item_gj where YEAR_MONTH = ${yearMonth}";
|
||||
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.CONFIDENCE
|
||||
data << r.TARGET_AVG_PRICE
|
||||
data << r.DEALDATE
|
||||
data << r.UNIT_PRICE
|
||||
data << r.BUILDAREA
|
||||
data << r.FITMENT
|
||||
data << r.HOUSEASPECT
|
||||
data << r.FLOORNUM
|
||||
data << r.FLOORCNT
|
||||
data << r.DATA_TYPE
|
||||
data << r.RATE
|
||||
data << r.PE
|
||||
data << r.CREATETIME
|
||||
allRows << data
|
||||
});
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, CONFIDENCE,TARGET_AVG_PRICE, \n" +
|
||||
"to_char(DEALDATE,'yyyy-mm-dd hh24:mi:ss') as DEALDATE, UNIT_PRICE, BUILDAREA, FITMENT, HOUSEASPECT, FLOORNUM, FLOORCNT, DATA_TYPE, RATE, PE, \n" +
|
||||
"to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME from avm_evaluation_item_gj where YEAR_MONTH = ${yearMonth} AND CITYID='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.CONFIDENCE
|
||||
data << r.TARGET_AVG_PRICE
|
||||
data << r.DEALDATE
|
||||
data << r.UNIT_PRICE
|
||||
data << r.BUILDAREA
|
||||
data << r.FITMENT
|
||||
data << r.HOUSEASPECT
|
||||
data << r.FLOORNUM
|
||||
data << r.FLOORCNT
|
||||
data << r.DATA_TYPE
|
||||
data << r.RATE
|
||||
data << r.PE
|
||||
data << r.CREATETIME
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
|
||||
def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
|
||||
@@ -157,31 +169,35 @@ class ExportOracleEvaluationData {
|
||||
}
|
||||
|
||||
def exportCommunityBasePrice(yearMonth){
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth}";
|
||||
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.FAKE_RATE
|
||||
data << r.DIFF_RATE
|
||||
data << r.CONFI_RATE
|
||||
data << r.CORR_RATE
|
||||
data << r.CONFIDENCE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth} AND CITYID='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.FAKE_RATE
|
||||
data << r.DIFF_RATE
|
||||
data << r.CONFI_RATE
|
||||
data << r.CORR_RATE
|
||||
data << r.CONFIDENCE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
|
||||
def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
|
||||
@@ -200,31 +216,35 @@ class ExportOracleEvaluationData {
|
||||
}
|
||||
|
||||
def exportCommunityBasePriceGj(yearMonth){
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth}";
|
||||
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.FAKE_RATE
|
||||
data << r.DIFF_RATE
|
||||
data << r.CONFI_RATE
|
||||
data << r.CORR_RATE
|
||||
data << r.CONFIDENCE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth} AND CITYID='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.FAKE_RATE
|
||||
data << r.DIFF_RATE
|
||||
data << r.CONFI_RATE
|
||||
data << r.CORR_RATE
|
||||
data << r.CONFIDENCE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
|
||||
def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
@@ -239,21 +259,24 @@ class ExportOracleEvaluationData {
|
||||
}
|
||||
|
||||
def exportCityPrice(month){
|
||||
def sql = "select ID, CITYID, CITYNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from city_price_gj where year_month=${month}";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.PRICE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID, CITYID, CITYNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from city_price_gj where year_month=${month} AND CITYID='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.PRICE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
|
||||
def fileName = "/ccb/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
@@ -268,23 +291,27 @@ class ExportOracleEvaluationData {
|
||||
}
|
||||
|
||||
def exportRegionPrice(month){
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from DISTRICT_PRICE_GJ where year_month=${month}";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.PRICE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from DISTRICT_PRICE_GJ where year_month=${month} AND CITYID='${cityCode}'";
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.PRICE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
|
||||
def fileName = "/ccb/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
@@ -300,68 +327,67 @@ class ExportOracleEvaluationData {
|
||||
|
||||
def exportCommunityPdescribeGj(month){
|
||||
|
||||
// def citys = CcbCommonUtils.citys;
|
||||
// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
|
||||
def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
//
|
||||
// for(def city : citys) {
|
||||
// def cityCode = cityCodeDataMap.get(city)
|
||||
def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time=${month}";
|
||||
// def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time in (202110,202111,202112,202201)";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.COMMUNITY_ID
|
||||
data << r.CITYID
|
||||
data << r.CITY_NAME
|
||||
data << r.DISTRICT_CODE
|
||||
data << r.DISTRICT_NAME
|
||||
data << r.COMMUNITY_NAME
|
||||
data << r.PQ_NAME
|
||||
data << r.BASE_PRICE
|
||||
data << r.CONFIDENCE_LEVEL
|
||||
data << r.CNT
|
||||
data << r.MIN_PRICE
|
||||
data << r.MEDIANPRICE
|
||||
data << r.MEANPRICE
|
||||
data << r.MAX_PRICE
|
||||
data << r.TIME
|
||||
data << r.FIRSTDATAT
|
||||
data << r.THIRDDATA
|
||||
data << r.RELATIVEERROR
|
||||
data << r.SKEWNESS
|
||||
data << r.PQ_PRICE_RANGE
|
||||
data << r.DISTRICT_PRICE_RANGE
|
||||
data << r.DESCRIPTION
|
||||
data << r.PRIV_BASE_PRICE
|
||||
data << r.IS_ARTTFICIAL
|
||||
data << r.PRIV_FINAL_PRICE
|
||||
data << r.CREATE_DATE
|
||||
data << r.PRICE
|
||||
data << r.PRICE_SOURCE
|
||||
data << r.CASE_MD_PRICE
|
||||
data << r.CASE_AVG_PRICE
|
||||
data << r.INDEX_LABEL
|
||||
data << r.MAIN_PROPERTY
|
||||
data << r.COMMTYPE
|
||||
data << r.NEW_DEAL_PRICE
|
||||
data << r.NEW_DEAL_DATE
|
||||
data << r.PRICE_MOM_RATIO
|
||||
data << r.MAX_MOM_RATIO
|
||||
data << r.PRICE_YOY_RATIO
|
||||
data << r.SATUR_RATIO
|
||||
data << r.NEIGHBOR_PRICE
|
||||
allRows << data
|
||||
});
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time=${month} AND CITYID='${cityCode}'";
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.COMMUNITY_ID
|
||||
data << r.CITYID
|
||||
data << r.CITY_NAME
|
||||
data << r.DISTRICT_CODE
|
||||
data << r.DISTRICT_NAME
|
||||
data << r.COMMUNITY_NAME
|
||||
data << r.PQ_NAME
|
||||
data << r.BASE_PRICE
|
||||
data << r.CONFIDENCE_LEVEL
|
||||
data << r.CNT
|
||||
data << r.MIN_PRICE
|
||||
data << r.MEDIANPRICE
|
||||
data << r.MEANPRICE
|
||||
data << r.MAX_PRICE
|
||||
data << r.TIME
|
||||
data << r.FIRSTDATAT
|
||||
data << r.THIRDDATA
|
||||
data << r.RELATIVEERROR
|
||||
data << r.SKEWNESS
|
||||
data << r.PQ_PRICE_RANGE
|
||||
data << r.DISTRICT_PRICE_RANGE
|
||||
data << r.DESCRIPTION
|
||||
data << r.PRIV_BASE_PRICE
|
||||
data << r.IS_ARTTFICIAL
|
||||
data << r.PRIV_FINAL_PRICE
|
||||
data << r.CREATE_DATE
|
||||
data << r.PRICE
|
||||
data << r.PRICE_SOURCE
|
||||
data << r.CASE_MD_PRICE
|
||||
data << r.CASE_AVG_PRICE
|
||||
data << r.INDEX_LABEL
|
||||
data << r.MAIN_PROPERTY
|
||||
data << r.COMMTYPE
|
||||
data << r.NEW_DEAL_PRICE
|
||||
data << r.NEW_DEAL_DATE
|
||||
data << r.PRICE_MOM_RATIO
|
||||
data << r.MAX_MOM_RATIO
|
||||
data << r.PRICE_YOY_RATIO
|
||||
data << r.SATUR_RATIO
|
||||
data << r.NEIGHBOR_PRICE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
println allRows.size()
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
// }
|
||||
|
||||
println "community_p_describe_gj 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload(null, fileName, curDate)
|
||||
println "community_p_describe_gj 上传Ftp完成......"
|
||||
@@ -369,8 +395,6 @@ class ExportOracleEvaluationData {
|
||||
|
||||
def exportCommCaseDetailGj(month){
|
||||
|
||||
def citys = CcbCommonUtils.citys;
|
||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"
|
||||
def fileName = "/ccb/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
|
||||
@@ -380,8 +404,8 @@ class ExportOracleEvaluationData {
|
||||
def headers = []
|
||||
|
||||
for(def city : citys){
|
||||
def cityCode = cityCodeDataMap.get(city)
|
||||
def sql = "select ID, CITYID, COMMUNITY_ID, NETLISTING_ID, PRICE_DATE, to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE from comm_case_detail_gj where cityid='${cityCode}' and price_date=${month}";
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select ID, CITYID, COMMUNITY_ID, NETLISTING_ID, PRICE_DATE, to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE from comm_case_detail_gj where cityid='${cityCode}' and price_date=${month} AND CITYID='${cityCode}'";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
|
||||
+21
-1
@@ -29,7 +29,9 @@ class FjwPricePkCcbPrice {
|
||||
// task.updatePrice()
|
||||
// task.addFjwPrice()
|
||||
// task.addCcbPrice()
|
||||
task.addMarketPrice()
|
||||
|
||||
task.addCcbPriceFromGuided()
|
||||
// task.addMarketPrice()
|
||||
}
|
||||
|
||||
def addMarketPrice(){
|
||||
@@ -66,6 +68,24 @@ class FjwPricePkCcbPrice {
|
||||
})
|
||||
}
|
||||
|
||||
def addCcbPriceFromGuided(){
|
||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
ExcelUtils.multiThreadingModify("D:\\数据\\建行\\二期\\人工指导价2.xls",{d->
|
||||
if(d['B'] && !d['O']){
|
||||
def cityId = d['D']
|
||||
def dist = CommonDatautils.findDistrictById(d['B'])
|
||||
if(dist){
|
||||
def map = getCommunityBasePriceGjByCommid(cityId, dist._id.toString(), 202209)
|
||||
if(map){
|
||||
d['O'] = map.avg_price
|
||||
d['P'] = map.calc_type
|
||||
d['Q'] = map.credit
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
def updatePrice(){
|
||||
def index = 0
|
||||
|
||||
+7
-3
@@ -30,21 +30,25 @@ class GuiDingPriceBatch extends BaseBatch{
|
||||
def sDate= Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"));
|
||||
def static final DBCollection dataProcessColl = CrawalDBUtil.getDataProcessCol();
|
||||
|
||||
def curDate= DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-15";
|
||||
|
||||
static main(args) {
|
||||
runBatch(new GuiDingPriceBatch(), args);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(Object args) {
|
||||
def citys = CcbCommonUtils.citys_252;
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def rows = []
|
||||
|
||||
CcbCommonUtils.deleteGuidedPrice(curDate)
|
||||
for (def city : citys) {
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||
|
||||
//添加自己库中的人工指导价
|
||||
def prices = CcbCommonUtils.findPersonPrice(city, "2021-09-01", "2022-10-12")
|
||||
def prices = CcbCommonUtils.findPersonPrice(city, "2022-11-25", "2022-12-24")
|
||||
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
||||
if(prices){
|
||||
def distMap = getDistrictMap(city)
|
||||
def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices)
|
||||
@@ -150,7 +154,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
||||
ret << CcbCommonUtils.getCcbCity(dist.city)
|
||||
ret << areaData.district_code
|
||||
ret << areaData.district
|
||||
ret << DateUtils.formatDateByPattern(ps.guiding_date, "yyyy-MM-dd HH:mm:ss")
|
||||
ret << curDate//DateUtils.formatDateByPattern(ps.guiding_date, "yyyy-MM-dd HH:mm:ss")
|
||||
ret << ps.guiding_value
|
||||
ret << "房价网"
|
||||
ret << ""
|
||||
|
||||
+171
-27
@@ -33,8 +33,8 @@ import java.util.regex.*;
|
||||
def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
|
||||
//def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
|
||||
// "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
|
||||
DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com")
|
||||
|
||||
@@ -45,6 +45,56 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw
|
||||
def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017";
|
||||
def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl)
|
||||
|
||||
|
||||
|
||||
//def citys = ['苏州','杭州','宁波','温州','嘉兴','湖州','绍兴','金华','衢州','舟山','台州','丽水']
|
||||
//
|
||||
//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
//def rets = []
|
||||
//for(def c : citys){
|
||||
// def citycode = cityCodeDataMap.get(c)
|
||||
// def datas = findAllData(sqlInstance236, citycode)
|
||||
// def totalCount = datas.size()
|
||||
// def landareaCount = 0;
|
||||
// def buildareaCount = 0
|
||||
// def greeningrateCount = 0
|
||||
// def plotratioCount = 0
|
||||
// for(def m : datas){
|
||||
// if(m.landarea){
|
||||
// landareaCount ++
|
||||
// }
|
||||
// if(m.buildarea){
|
||||
// buildareaCount++
|
||||
// }
|
||||
// if(m.greeningrate){
|
||||
// greeningrateCount++
|
||||
// }
|
||||
// if(m.plotratio){
|
||||
// plotratioCount++
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// def landAreaPre = landareaCount*100/totalCount
|
||||
// def buildAreaPre = buildareaCount*100/totalCount
|
||||
// def greeningratePre = greeningrateCount*100/totalCount
|
||||
// def plotratioPre = plotratioCount*100/totalCount
|
||||
// rets << [c, totalCount, landAreaPre, buildAreaPre, greeningratePre, plotratioPre]
|
||||
//}
|
||||
//
|
||||
//ExcelUtils.write("D:\\数据\\建行\\测试\\12城覆盖率统计.xlsx",rets, "覆盖率")
|
||||
|
||||
def findAllData(sqlInstance236, citycode){
|
||||
def sql = "select landarea,buildarea,greeningrate,plotratio from bigdata_community_fjw where cityid='${citycode}'"
|
||||
def rets = []
|
||||
sqlInstance236.eachRow(sql,{r->
|
||||
rets << ["landarea":r.landarea, "buildarea":r.buildarea, "greeningrate":r.greeningrate, "plotratio":r.plotratio]
|
||||
});
|
||||
return rets
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
////def url = "https://sh.anjuke.com"
|
||||
////def s = DataHandleUtils.findMatchPattern(name, "https://\\w+.anjuke.com")
|
||||
////println s
|
||||
@@ -446,6 +496,56 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
|
||||
//// }
|
||||
////},0)
|
||||
//
|
||||
|
||||
//ExcelUtils.multiThreadingModify("D:\\数据\\建行\\二期\\252个城市删除小区.xlsx",{d->
|
||||
// if(d['A']){
|
||||
// def dbo = CommonDatautils.findDistrictById(d['D'])
|
||||
// if(dbo){
|
||||
// def udata = new BasicDBObject()
|
||||
//// udata.put("name_cat", 11)
|
||||
// udata.put("status", 1)
|
||||
// udata.put("m_date",new Date())
|
||||
//
|
||||
// def q = new BasicDBObject()
|
||||
// q.put("_id", dbo._id)
|
||||
// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
|
||||
// }else{
|
||||
// println dbo._id.toString() +" 没找到"
|
||||
// }
|
||||
// }
|
||||
//},0)
|
||||
|
||||
//def citys = ["海口","三亚","三沙","五指山","琼海","儋州","文昌","万宁","东方","定安","屯昌","澄迈","临高","白沙","昌江","乐东","陵水","保亭","琼中"]
|
||||
//for(def c : citys){
|
||||
// def districts = CommonDatautils.findAllDistrictByCity(c, "district", ["city","name"])
|
||||
// println c +" "+districts.size()
|
||||
//}
|
||||
|
||||
//def cityCodeMap = CcbCommonUtils.findCityCodeValue()
|
||||
//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\252城第三方均价.xlsx", { d ->
|
||||
//// cityCodeMap.each {k,v->
|
||||
//// if(d['A'].toString()==v){
|
||||
//// d['C'] = k
|
||||
//// println k
|
||||
//// }
|
||||
//// }
|
||||
//// if(!d['D']){
|
||||
//// d['D'] = findCount(d['A'].toString().toDouble().toInteger().toString(), sqlInstance94)
|
||||
//// }
|
||||
// d['F'] = findThirdCommCount(d['A'].toString().toDouble().toInteger().toString(), sqlInstance94)
|
||||
//
|
||||
//});
|
||||
|
||||
//def citys = CcbCommonUtils.citys_252
|
||||
//def runCitys = ['聊城','宝鸡','韶关','阜阳','宜春','周口','河源','忻州','三门峡','永州','衢州','盘锦','白银','玉溪','达州','景德镇','鹤壁','辽阳','六盘水','张家界','海西州','兴安盟','阿坝州','那曲','西双版纳州','辽源','邯郸','平顶山','南阳','商丘','南平','黄冈','鄂尔多斯','泸州','六安','葫芦岛','潮州','宿州','庆阳','怀化','张掖','黔东南','云浮','本溪','百色','伊春','昭通','锡林郭勒盟','克拉玛依','天门','博尔塔拉','大兴安岭','潍坊','绵阳','梅州','襄阳','包头','枣庄','东营','信阳','晋中','开封','承德','茂名','荆门','红河','陇南','铁岭','黄山','咸宁','延安','广元','乌兰察布','随州','益阳','阳泉','内江','酒泉','毕节','安顺','丽江','商洛','来宾','黔西南','防城港','铜仁','儋州','崇左','衡阳','咸阳','新乡','南充','荆州','德阳','汉中','湘潭','赤峰','佳木斯','丹东','淮南','抚州','丽水','广安','亳州','昌吉','鄂州','白城','恩施','伊犁','铜陵','林芝','海东','桂林','临汾','渭南','滨州','菏泽','孝感','营口','濮阳','抚顺','自贡','新余','鸡西','钦州','淮北','安康','资阳','乌海','中卫','鹤岗','石嘴山','日喀则','昌都','德宏州','吐鲁番','阿勒泰','临沂','威海','泰安','宿迁','德州','安阳','驻马店','绥化','上饶','莆田','蚌埠','大庆','漯河','十堰','晋城','宣城','舟山','邵阳','大理','楚雄','天水','池州','松原','阜新','巴音郭楞','仙桃','武威','普洱','河池','铜川','迪庆州','潜江','贺州','塔城','济宁','江门','赣州','许昌','滁州','龙岩','运城','长治','乐山','郴州','遂宁','曲靖','呼伦贝尔','阳江','朝阳','巴彦淖尔','朔州','娄底','梧州','巴中','黔南','吴忠','临夏','凉山州','定西','萍乡','甘南','攀枝花','克孜勒苏','山南','临沧','金昌','邢台','衡水','宁德','榆林','鞍山','焦作','牡丹江','齐齐哈尔','眉山','三明','吕梁','吉安','平凉','通辽','揭阳','黄石','宜宾','延边','汕尾','玉林','通化','四平','阿克苏','贵港','白山','双鸭山','湘西','哈密','保山','鹰潭','喀什','雅安','黑河','和田','固原','阿拉善盟','七台河','嘉峪关']
|
||||
//for(def c : citys){
|
||||
// if(!runCitys.contains(c)){
|
||||
// def code = cityCodeMap.get(c)
|
||||
// println code +" "+ c
|
||||
// }
|
||||
//}
|
||||
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -731,15 +831,26 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
|
||||
// return count
|
||||
//}
|
||||
//
|
||||
//def findCount(cityid, sqlInstance){
|
||||
// def sql = "select count(*) as count from bigdata_community_gj where cityid='${cityid}' and status=0";
|
||||
// def count = 0
|
||||
//
|
||||
// sqlInstance.eachRow(sql,{r->
|
||||
// count = r.count
|
||||
// });
|
||||
// return count
|
||||
//}
|
||||
def findCount(cityid, sqlInstance){
|
||||
def sql = "select count(*) as count from bigdata_community_gj where cityid='${cityid}' and status=0";
|
||||
def count = 0
|
||||
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
count = r.count
|
||||
});
|
||||
return count
|
||||
}
|
||||
|
||||
|
||||
def findThirdCommCount(cityid, sqlInstance){
|
||||
def sql = "select count(*) as count from (select count(*) from bigdata_third_party_price_gj where price_date=202209 and cityid='${cityid}' group by commid)";
|
||||
def count = 0
|
||||
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
count = r.count
|
||||
});
|
||||
return count
|
||||
}
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -976,6 +1087,15 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
|
||||
//}
|
||||
|
||||
|
||||
def fileName = "D:\\数据\\建行\\房产估值\\指导价\\国信达价格-杭州.xlsx"
|
||||
ExcelUtils.multiThreadingModify(fileName, { d ->
|
||||
def dist = CommonDatautils.findDistrictById(d['A'])
|
||||
if(dist){
|
||||
d['C'] = dist.city
|
||||
d['D'] = dist.region
|
||||
d['E'] = dist.name
|
||||
}
|
||||
})
|
||||
|
||||
//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\0922入库数据.xlsx"
|
||||
//def datas = ExcelUtils.read(fileName, 0, 1)
|
||||
@@ -1001,27 +1121,27 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
|
||||
|
||||
|
||||
|
||||
//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\录入人工查价_0922_300.xlsx"
|
||||
|
||||
//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\人工指导价录入_1020.xlsx"
|
||||
//
|
||||
//ExcelUtils.multiThreadingModify(fileName, {d->
|
||||
// if(d['A']){
|
||||
// def region = RegionData.formatRegion(d['A'], d['B'])
|
||||
// if(region){
|
||||
// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district")
|
||||
// if(dist){
|
||||
// d['E'] = dist.region
|
||||
// d['F'] = dist._id.toString()
|
||||
// }
|
||||
// }
|
||||
//// if(!d['Q']){
|
||||
//// def dist = CommonDatautils.findDistrictById(d['A'])
|
||||
//////
|
||||
//// def region = RegionData.formatRegion(d['A'], d['B'])
|
||||
//// if(region){
|
||||
//// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district")
|
||||
//// if(dist){
|
||||
//// d['H'] = dist.region
|
||||
////// d['G'] = dist.name
|
||||
//// d['I'] = dist.status
|
||||
//// d['E'] = dist.region
|
||||
//// d['F'] = dist._id.toString()
|
||||
//// }
|
||||
//// }
|
||||
// if(!d['F']){
|
||||
// def dist = CommonDatautils.findDistrictById(d['A'])
|
||||
////
|
||||
// if(dist){
|
||||
//// d['H'] = dist.region
|
||||
//// d['G'] = dist.name
|
||||
// d['F'] = dist.status
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//},0)
|
||||
@@ -1038,6 +1158,30 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business
|
||||
|
||||
|
||||
|
||||
//ExcelUtils.modify("D:\\数据\\建行\\二期\\付.xlsx",{d->
|
||||
// def obj = CommonDatautils.findDistrict(d['D'],d['L'], d['K'], "district")
|
||||
// if(obj){
|
||||
// def count = findGuidedPrice(sqlInstance236, obj._id.toString())
|
||||
// if(count){
|
||||
// d['M'] = "存在"
|
||||
// }
|
||||
// d['N'] = obj.name_cat
|
||||
// d['O'] = obj.estate_type2
|
||||
// }
|
||||
//
|
||||
//})
|
||||
|
||||
def findGuidedPrice(sqlInstance, id){
|
||||
def count = 0
|
||||
def sql = "select count(*) as count from guided_price_gj where commid='${id}'"
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
count = r.count
|
||||
});
|
||||
return count
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+6
-6
@@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap
|
||||
@BatchOwner(Watcher.GaoJuan)
|
||||
class ThirdPartyPriceBatch extends BaseBatch {
|
||||
|
||||
def sDate= 202109//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
def startDate = 202107
|
||||
def endDate = 202109
|
||||
def sDate= 202211//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
def startDate = 202209
|
||||
def endDate = 202211
|
||||
// def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM"));
|
||||
|
||||
static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43")
|
||||
@@ -45,11 +45,11 @@ class ThirdPartyPriceBatch extends BaseBatch {
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def rows = []
|
||||
def index = 0
|
||||
def weekend = DateUtils.getFirstDayOfWeek(new Date())
|
||||
def weekend = DateUtils.getFirstDayOfWeek(DateUtils.parseFromTightByPattern(sDate+"15", "yyyyMMdd"))
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
for(def city : citys){
|
||||
index++
|
||||
def statMap = getDistrictStatByCity(city, weekend)
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||
|
||||
def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name","name_cat", "estate_type2","lng"])
|
||||
@@ -502,8 +502,8 @@ class ThirdPartyPriceBatch extends BaseBatch {
|
||||
def findThirdPartyPrice(def city, def statMap){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
|
||||
q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate))
|
||||
|
||||
def dbcursor = AVERAGE_STATISTICS.find(q).sort(new BasicDBObject("s_date", -1))
|
||||
def map = [:]
|
||||
for(def db : dbcursor){
|
||||
|
||||
+24
-7
@@ -40,7 +40,7 @@ class TradeStatLog {
|
||||
|
||||
static main(args) {
|
||||
def task = new TradeStatLog()
|
||||
task.run()//统计最近3个月抓取的成交数据量
|
||||
// task.run()//统计最近3个月抓取的成交数据量
|
||||
// task.exportTrade()//导出未入库成交
|
||||
// task.thirdPartyStat()
|
||||
// println Calendar.getInstance().get(Calendar.YEAR)
|
||||
@@ -50,8 +50,25 @@ class TradeStatLog {
|
||||
// task.deleteDealData2()
|
||||
// task.statTableCount()
|
||||
// task.filterTrade()
|
||||
// task.updateDealPriceType()
|
||||
|
||||
}
|
||||
|
||||
def updateDealPriceType(){
|
||||
def citys = CommonDatautils.findAllCity()
|
||||
def index = 0
|
||||
for(def c : citys){
|
||||
DEAL_PRICE_COLL.find(new BasicDBObject("city", c)).sort(new BasicDBObject("trade_date",-1)).batchSize(5000).each {it->
|
||||
if(it.total_price instanceof Double){
|
||||
index ++
|
||||
println index+" "+it.city+" "+it.total_price+" "+it._id.toString()
|
||||
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("total_price", (int)it.total_price)
|
||||
DEAL_PRICE_COLL.update(new BasicDBObject("_id", it._id), new BasicDBObject('$set', udata))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def statTableCount(){
|
||||
@@ -73,15 +90,15 @@ class TradeStatLog {
|
||||
}
|
||||
|
||||
def run(){
|
||||
def citys = CcbCommonUtils.citys_92;
|
||||
def citys = CcbCommonUtils.citys_all;
|
||||
def rets = []
|
||||
rets << ["城市","7月总量","8月总量","9月总量","占比","贝壳","链家", "我爱我家","房天下","中原"]
|
||||
rets << ["城市","9月总量","10月总量","11月总量","占比","贝壳","链家", "我爱我家","房天下","中原"]
|
||||
def sources = ["贝壳找房","链家在线","我爱我家","房天下","中原地产"]
|
||||
//def startDate = "2021-05-01"
|
||||
def startDate = "2022-07-01"
|
||||
def date = "2022-08-01"
|
||||
def endDate = "2022-09-01"
|
||||
def newDate = "2022-10-01"
|
||||
def startDate = "2022-09-01"
|
||||
def date = "2022-10-01"
|
||||
def endDate = "2022-11-01"
|
||||
def newDate = "2022-12-01"
|
||||
|
||||
for(def city : citys){
|
||||
def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd"))
|
||||
|
||||
+280
@@ -0,0 +1,280 @@
|
||||
package com.fangjia.script.ccbevaluation.data
|
||||
|
||||
import com.fangjia.script.BaseBatch
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.gj.district.FangjiaClientUtils
|
||||
import com.fangjia.script.lixue.util.DBUtils
|
||||
import com.fangjia.script.util.DbUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
import com.fangjia.script.util.MongoUtils
|
||||
import com.mongodb.BasicDBObject
|
||||
import com.mongodb.DBCollection
|
||||
import org.elasticsearch.xpack.sql.jdbc.EsDataSource
|
||||
|
||||
import java.sql.ResultSet
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.ExecutorService
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.atomic.AtomicLong
|
||||
|
||||
class AddressCut extends BaseBatch{
|
||||
|
||||
|
||||
final DBCollection thirdPartyPriceColl = MongoUtils.getCollectionByName("fangjia_craw", "third_party_price", "192.168.0.235", 27018)
|
||||
|
||||
public static EsDataSource dataSource = new EsDataSource()
|
||||
private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200?timezone=UTC&page.size=240&connect.timeout=240000&network.timeout=60000&page.timeout=240000&query.timeout=90000"
|
||||
static {
|
||||
dataSource.setUrl(address)
|
||||
Properties connectionProperties = new Properties()
|
||||
connectionProperties.put("user", "developer")
|
||||
connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3")
|
||||
dataSource.setProperties(connectionProperties)
|
||||
}
|
||||
static main(args) {
|
||||
runBatch(new AddressCut(), args);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(Object args) {
|
||||
<<<<<<< HEAD
|
||||
// sameAddr()
|
||||
seaweedStreetUpdate()
|
||||
}
|
||||
|
||||
def seaweedStreetUpdate(){
|
||||
ExcelUtils.multiThreadingModify("D:\\数据\\建行\\小区地址拆分\\已核实-路2.xlsx",{d->
|
||||
if(d['A']){
|
||||
def dbo = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district")
|
||||
if(dbo){
|
||||
def udate = new BasicDBObject()
|
||||
def street = null
|
||||
def address = ""
|
||||
if(d['E']){
|
||||
street = d['E']
|
||||
udate.put("street", street)
|
||||
address = street
|
||||
}
|
||||
def streetNum = null
|
||||
if(d['F']){
|
||||
streetNum = d['F']
|
||||
udate.put("street_number", streetNum)
|
||||
address = address + streetNum
|
||||
}
|
||||
|
||||
if(dbo.address!=address){
|
||||
udate.put("address", address)
|
||||
}
|
||||
if(udate){
|
||||
udate.put("m_date", new Date())
|
||||
DBUtils.seaweed.update(new BasicDBObject('_id', dbo.get("_id")), new BasicDBObject('$set', udate))
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
=======
|
||||
// sameAddr() //相同地址小区
|
||||
// roadMatch()
|
||||
addAnjukeRoad()
|
||||
|
||||
}
|
||||
|
||||
def addAnjukeRoad(){
|
||||
ExcelUtils.multiThreadingModify("D:\\数据\\建行\\房产估值\\小区地址拆分\\小区地址切分(结果)_1.xlsx", { d ->
|
||||
def roads = findThirdPartyPrice(d['A'], d['B'], d['C'], "链家")
|
||||
if(roads){
|
||||
d['O'] = roads[0]
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
def findThirdPartyPrice(city, region, name, source){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
q.put("region", region)
|
||||
q.put("name", name)
|
||||
q.put("source", source)
|
||||
def dbcursor = thirdPartyPriceColl.find(q).sort(new BasicDBObject("s_date", -1)).limit(10)
|
||||
def roads = []
|
||||
for(def d : dbcursor){
|
||||
if(d.address && !roads.contains(d.address)){
|
||||
roads << d.address
|
||||
}
|
||||
}
|
||||
return roads
|
||||
}
|
||||
|
||||
def roadMatch(){
|
||||
def cityRoadsMap = queryPoiMap()
|
||||
println "道路加载完成....."
|
||||
ExcelUtils.modify("D:\\数据\\建行\\房产估值\\小区地址拆分\\小区地址切分(结果)_1.xlsx", { d ->
|
||||
def roads = cityRoadsMap.get(d['A'])
|
||||
// if (roads && roads.contains(d['E'])) {
|
||||
// d['L'] = "是"
|
||||
// println d['A'] + " " + d['E']
|
||||
// }
|
||||
|
||||
if(roads){
|
||||
for(def road : roads){
|
||||
if(!d['L'] && d['E'] && d['E'].toString().contains(road)){
|
||||
d['L'] = "中间包含"
|
||||
d['M'] = road
|
||||
println d['A'] + " " + d['E']
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
>>>>>>> c1a5ab8c6aa973a91e6be5547ec0925db3fa500f
|
||||
}
|
||||
|
||||
def sameAddr() {
|
||||
def citys = CommonDatautils.findAllCity()
|
||||
def dataMap = [:]
|
||||
def index = 0
|
||||
for (def c : citys) {
|
||||
index++
|
||||
def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city", "region", "name", "address"])
|
||||
|
||||
def addrMap = [:]
|
||||
for (def dist : dists) {
|
||||
if (dist.address) {
|
||||
def rets = addrMap.get(dist.address)
|
||||
if (!rets) {
|
||||
rets = []
|
||||
}
|
||||
rets << dist
|
||||
addrMap.put(dist.address, rets)
|
||||
}
|
||||
}
|
||||
dataMap.put(c, addrMap)
|
||||
println index +" "+c
|
||||
}
|
||||
|
||||
|
||||
def sameAddrList = []
|
||||
for(def c : citys) {
|
||||
def cityMap = dataMap.get(c)
|
||||
if(cityMap){
|
||||
cityMap.each{addr,rets->
|
||||
if(rets && rets.size()>1){
|
||||
def keys = new HashSet()
|
||||
for(def d : rets){
|
||||
if(d.name){
|
||||
def name = d.name.replace("一期","").replace("二期","").replace("三期","").replace("四期","").replace("五期","").replace("六期","").replace("七期","").replace("八期","").replace("九期","").replace("十期","").replace("一区","").replace("二区","").replace("三区","").replace("四区","").replace("五区","").replace("六区","").replace("七区","").replace("八区","").replace("九区","").replace("十区","").replace("A区","").replace("B区","").replace("C区","").replace("D区","")
|
||||
.replace("十一街区","").replace("十二街区","").replace("十三街区","").replace("十四街区","").replace("十五街区","").replace("十六街区","").replace("十七街区","").replace("十八街区","").replace("十九街区","").replace("一街区","").replace("二街区","").replace("三街区","").replace("四街区","").replace("五街区","").replace("六街区","").replace("七街区","").replace("八街区","").replace("九街区","").replace("十街区","")
|
||||
.replace("公寓","").replace("别墅","").replace("商住楼","").replace("花园","").replace("南区","").replace("北区","").replace("东区","").replace("西区","")
|
||||
keys << d.region +"##"+ name
|
||||
}
|
||||
}
|
||||
if(keys && keys.size()>1){
|
||||
for(def d : rets) {
|
||||
if (d.name) {
|
||||
sameAddrList << [d.city, d.region, d.name, d.address]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//ExcelUtils.write("D:\\数据\\小区\\同地址小区.xlsx", sameAddrList, "相同地址小区")
|
||||
FileUtils.batchCreateFile(sameAddrList, "D:\\数据\\小区\\同地址小区.txt", null, "utf-8", false);
|
||||
println "完成"
|
||||
}
|
||||
|
||||
|
||||
def addrCut(){
|
||||
def citys = CommonDatautils.findAllCity()
|
||||
def index = 0
|
||||
|
||||
def fileName = "/home/goojia/gj/address_split.txt"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = "D:\\数据\\address_split.txt"
|
||||
}
|
||||
for(def c : citys) {
|
||||
index++
|
||||
def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city", "region", "name","address"])
|
||||
def rets = cut(dists)
|
||||
FileUtils.batchCreateFile(rets, fileName, null, "utf-8", true);
|
||||
println index +" "+ c +" "+ rets.size()
|
||||
}
|
||||
}
|
||||
|
||||
def cut(rets){
|
||||
ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20)
|
||||
final CountDownLatch latch = new CountDownLatch(rets.size())
|
||||
def totalCount = new AtomicLong()
|
||||
def rows = new CopyOnWriteArrayList()
|
||||
for(def i=0;i<rets.size();i++){
|
||||
final def d = rets[i]
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
void run() {
|
||||
try{
|
||||
totalCount.addAndGet(1)
|
||||
if(d.address){
|
||||
def jsonObj = FangjiaClientUtils.addressStructure(d.city, d.address)
|
||||
if(jsonObj && jsonObj.result){
|
||||
def udata = new BasicDBObject()
|
||||
def street = null
|
||||
def street_number = null
|
||||
if(jsonObj.result.street){
|
||||
street = jsonObj.result.street
|
||||
}
|
||||
if(jsonObj.result.streetNumber){
|
||||
street_number = jsonObj.result.streetNumber
|
||||
}
|
||||
if(street || street_number){
|
||||
|
||||
println totalCount.get() +" "+d.city +" "+d.address +" "+street+" "+street_number
|
||||
|
||||
rows << [d.city,d.region, d.name, d.address, street, street_number]
|
||||
// udata.put("m_date", new Date())
|
||||
// DbUtils.seaweed.update(new BasicDBObject("_id", d._id), new BasicDBObject('$set', udata))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
latch.countDown()
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
latch.await()
|
||||
return rows;
|
||||
}
|
||||
|
||||
def queryPoiMap(){
|
||||
final StringBuffer sqlBuffer = new StringBuffer()
|
||||
sqlBuffer.append("SELECT cityname,name,type FROM amap_poi WHERE 1=1")
|
||||
// sqlBuffer.append(" and cityname = '" + city + "'")
|
||||
// sqlBuffer.append(" and name = '" + name + "'")
|
||||
sqlBuffer.append(" and type like '%道路名%'")
|
||||
// sqlBuffer.append(" and MATCH(name,'${name}')")
|
||||
// sqlBuffer.append(" and source = '高德' order by score() desc")
|
||||
ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString())
|
||||
def cityMap = [:]
|
||||
while (rs.next()) {
|
||||
def city = rs.getString("cityname");
|
||||
def road = rs.getString("name")
|
||||
def roads = cityMap.get(city)
|
||||
if(!roads){
|
||||
roads = new HashSet()
|
||||
}
|
||||
roads << road
|
||||
cityMap.put(city, roads)
|
||||
|
||||
}
|
||||
return cityMap;
|
||||
}
|
||||
|
||||
}
|
||||
+17
-1
@@ -1,6 +1,7 @@
|
||||
package com.fangjia.script.ccbevaluation.data
|
||||
|
||||
import com.fangjia.script.ccbevaluation.CcbCommonUtils
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.common.DataHandleUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
@@ -19,7 +20,22 @@ class CcbDataStat {
|
||||
static main(args) {
|
||||
def task = new CcbDataStat()
|
||||
// task.run()
|
||||
task.tradeRun()
|
||||
// task.tradeRun()
|
||||
task.regionDistStat()
|
||||
}
|
||||
|
||||
def regionDistStat(){
|
||||
def citys = CcbCommonUtils.citys_252
|
||||
def rows = []
|
||||
for(def c : citys){
|
||||
def regions = CommonDatautils.getRegionListByCity(c)
|
||||
for(def r : regions){
|
||||
def count = CommonDatautils.findRegionDistrictCount("district",c, r)
|
||||
rows << [c, r, count]
|
||||
println c +" "+r +" "+count
|
||||
}
|
||||
}
|
||||
ExcelUtils.write("d:\\数据\\建行\\区域小区量统计.xlsx", rows, "统计")
|
||||
}
|
||||
|
||||
def tradeRun(){
|
||||
|
||||
+623
@@ -0,0 +1,623 @@
|
||||
package com.fangjia.script.ccbevaluation.pgsql
|
||||
|
||||
import com.fangjia.script.ccbevaluation.CcbCommonUtils
|
||||
import com.fangjia.script.ccbevaluation.CcbFtpUtils
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import groovy.sql.Sql
|
||||
|
||||
class ExportPgsqlBaseEvaluation {
|
||||
|
||||
def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/postgres",
|
||||
"postgres", "postgres", "org.postgresql.Driver")
|
||||
def citys = null
|
||||
def cityCodeMap = CcbCommonUtils.findCityCodeValue()
|
||||
|
||||
def database = "base"
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
|
||||
def linux_prefix = "/home/goojia/ccb_data/evaluation/"
|
||||
def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\"
|
||||
|
||||
static main(args) {
|
||||
def task = new ExportPgsqlBaseEvaluation()
|
||||
task.run(args)
|
||||
}
|
||||
|
||||
def run(args) {
|
||||
citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
|
||||
def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
def lastMonthStr = "2022-09"//DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM")
|
||||
def new_dists = []
|
||||
|
||||
// exportEvaluationRateData()
|
||||
// exportBigdataPoiData()
|
||||
// exportBigdataDistrictData()
|
||||
|
||||
//第三方网站权重表
|
||||
// exportWebsiteRate();
|
||||
|
||||
// exportGuidedPrice()//随人工改变//
|
||||
// exportCommunityGuidedPrice(lastMonth.toString()+"28")//随政策//
|
||||
//
|
||||
//// //处理小区情况
|
||||
// exportBigdataCommunity()//
|
||||
// exportCommunityStaging()//没cityid
|
||||
// exportCommunityBuildType()//
|
||||
//
|
||||
// exportThirdPartyPrice2(lastMonth, new_dists)//
|
||||
exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19
|
||||
// exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01
|
||||
|
||||
|
||||
}
|
||||
|
||||
def exportEvaluationRateData() {
|
||||
def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_ceft,gujia_seq, gujia_urbn,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_evaluate_rate_gj_w";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_ceft_id
|
||||
data << r.gujia_ceft_tp
|
||||
data << r.gujia_ceft
|
||||
data << r.gujia_seq
|
||||
data << r.gujia_urbn
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("EVALUATE_RATE", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportBigdataPoiData() {
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,lgt,ltt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_bigdata_poi_gj_w where urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_fsid
|
||||
data << r.poi_nm
|
||||
data << r.gujia_tp
|
||||
data << r.gujia_tp_ecd
|
||||
data << r.lgt
|
||||
data << r.ltt
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("BIGDATA_POI_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportBigdataDistrictData() {
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_lgc_admndiv_dsc,gujia_lgc_admndiv_cd,gujia_adiv_cd_val,gujia_data_tm from "+database+".t0831_bigdata_district_gj_w where urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.gujia_admndiv_nm_cpa
|
||||
data << r.urbn_id
|
||||
data << r.gujia_natstd_cd
|
||||
data << r.gujia_dspl_seq
|
||||
data << r.gujia_admndiv_cgy
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
data << r.gujia_lgc_admndiv_dsc
|
||||
data << r.gujia_lgc_admndiv_cd
|
||||
data << r.gujia_adiv_cd_val
|
||||
data << r.gujia_data_tm
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("BIGDATA_DISTRICT_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportWebsiteRate(){
|
||||
def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_wgt,gujia_tp,gujia_src_co,urbn_id,gujia_urbn,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_website_config_gj_w";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujiadatawebst_src_id
|
||||
data << r.gujia_data_webst_src
|
||||
data << r.gujiadatawebstmpng_id
|
||||
data << r.gujia_wgt
|
||||
data << r.gujia_tp
|
||||
data << r.gujia_src_co
|
||||
data << r.urbn_id
|
||||
data << r.gujia_urbn
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
allRows << data
|
||||
});
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("WEBSITE_CONFIG_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
|
||||
def exportGuidedPrice() {
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_fsid,gujia_bds_id,comm_nm,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,to_char(gujia_drc_dt,'yyyy-mm-dd') as gujia_drc_dt,gujia_drc_prc,gujia_add_psn,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_guided_price_gj_w where urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
data << r.gujia_bds_id
|
||||
data << r.comm_nm
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.gujia_drc_dt
|
||||
data << r.gujia_drc_prc
|
||||
data << r.gujia_add_psn
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("GUIDED_PRICE_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportCommunityGuidedPrice(def date) {
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_drc_prc, gujia_drc_prc_src_val, rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_community_guide_price_gj_h where urbn_id='${cityCode}' and data_crt_tm>=to_date('${date}','yyyyMMdd')";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
data << r.gujia_bds_id
|
||||
data << r.comm_nm
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.gujia_drc_prc
|
||||
data << r.gujia_drc_prc_src_val
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("COMMUNITY_GUIDE_PRICE_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportBigdataCommunity(){
|
||||
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select urbn_id,gujia_admndiv_id,gujia_comm_id,gujia_admndiv_nm,comm_nm,gujia_dtl_adr,lgt,ltt,gujiaocpoflandtotarea,gujia_bld_tot_area,gujia_grnrate,gujia_vol_rate,gujia_park_num,gujia_bld_yr_rc,gujia_hs_use,gujia_totunits,gujia_data_tm,gujia_udt_mark_val,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_comm_tp_val,gujia_comm_fmnm,gujia_str,gujia_hsno,gujiawthr_new_pan_ind,gujia_comm_intd,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujia_src_co,gujia_vlgtwn_str_mng,gujia_lgc_admndiv_cd,gujia_lgc_adiv,gujia_bds_st_val from "+database+".t0831_bigdata_community_gj_w where urbn_id='${cityCode}' ";//where cityId in (350200,150100)
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_comm_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.comm_nm
|
||||
data << r.gujia_dtl_adr
|
||||
data << r.lgt
|
||||
data << r.ltt
|
||||
data << r.gujiaocpoflandtotarea
|
||||
data << r.gujia_bld_tot_area
|
||||
data << r.gujia_grnrate
|
||||
data << r.gujia_vol_rate
|
||||
data << r.gujia_park_num
|
||||
data << r.gujia_bld_yr_rc
|
||||
data << r.gujia_hs_use
|
||||
data << r.gujia_totunits
|
||||
data << r.gujia_data_tm
|
||||
data << r.gujia_udt_mark_val
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_comm_tp_val
|
||||
data << r.gujia_comm_fmnm
|
||||
data << r.gujia_str
|
||||
data << r.gujia_hsno
|
||||
data << r.gujiawthr_new_pan_ind
|
||||
data << r.gujia_comm_intd
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.gujia_src_co
|
||||
data << r.gujia_vlgtwn_str_mng
|
||||
data << r.gujia_lgc_admndiv_cd
|
||||
data << r.gujia_lgc_adiv
|
||||
data << r.gujia_bds_st_val
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("BIGDATA_COMMUNITY_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportCommunityStaging() {
|
||||
|
||||
def allRows = []
|
||||
def sql = "select gujia_instm_id,gujia_comm_id,gujiacomm_prim_prd_id,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_community_staging_gj_w";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_instm_id
|
||||
data << r.gujia_comm_id
|
||||
data << r.gujiacomm_prim_prd_id
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("COMMUNITY_STAGING_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportCommunityBuildType() {
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select urbn_id,gujia_comm_id,gujia_bld_tp_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_data_tm from "+database+".t0831_bigdata_commbuildtype_gj_w where urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
data << r.gujia_comm_id
|
||||
data << r.gujia_bld_tp_val
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
data << r.gujia_data_tm
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("BIGDATA_COMMBUILDTYPE_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportThirdPartyPrice2(price_date, new_dists) {
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def index = 0
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def allRows = []
|
||||
if(new_dists) {
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujia_avprc_dt_val,gujia_comm_avprc,gujia_comm_hgst_prc,gujia_comm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " +
|
||||
"urbn_id='${cityCode}' and gujia_avprc_dt_val=${price_date} and gujia_admndiv_id not in ${newstr} ";
|
||||
def rets1 = getThirdPartyDatas(sql1)
|
||||
allRows.addAll(rets1)
|
||||
|
||||
def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujia_avprc_dt_val,gujia_comm_avprc,gujia_comm_hgst_prc,gujia_comm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " +
|
||||
"urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} ";
|
||||
def rets2 = getThirdPartyDatas(sql2)
|
||||
allRows.addAll(rets2)
|
||||
}else{
|
||||
def sql = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujia_avprc_dt_val,gujia_comm_avprc,gujia_comm_hgst_prc,gujia_comm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where urbn_id='${cityCode}' and gujia_avprc_dt_val='${price_date}' ";
|
||||
allRows = getThirdPartyDatas(sql)
|
||||
}
|
||||
if(allRows && allRows.size()>0){
|
||||
index = index + 1
|
||||
if(index==1){
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
}else{
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload(null, fileName, curDate)
|
||||
}
|
||||
|
||||
def getThirdPartyDatas(def sql){
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_trdpt_avprc_id
|
||||
data << r.urbn_id
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_bds_id
|
||||
data << r.comm_nm
|
||||
data << r.gujia_dtsr_id
|
||||
data << r.gujia_dtsr_dsc
|
||||
data << r.gujia_avprc_dt_val
|
||||
data << r.gujia_comm_avprc
|
||||
data << r.gujia_comm_hgst_prc
|
||||
data << r.gujia_comm_lwst_prc
|
||||
data << r.data_udt_tm
|
||||
allRows << data
|
||||
})
|
||||
return allRows;
|
||||
}
|
||||
|
||||
|
||||
def exportBigdataDeal(def dealDate, def new_dists) {
|
||||
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
if(new_dists){
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql1 = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " +
|
||||
"from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}"
|
||||
def rets1 = dealData(sql1)
|
||||
|
||||
def sql2 = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " +
|
||||
"from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}"
|
||||
def rets2 = dealData(sql2)
|
||||
allRows.addAll(rets1)
|
||||
allRows.addAll(rets2)
|
||||
}else{
|
||||
def sql = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " +
|
||||
"from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd')";
|
||||
allRows.addAll(dealData(sql))
|
||||
}
|
||||
}
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("BIGDATA_DEAL_GJ", allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
|
||||
def dealData(def sql){
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
data << r.urbn_id
|
||||
data << r.mdl_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.gujia_str
|
||||
data << r.gujia_hsno
|
||||
data << r.gujia_comm_id
|
||||
data << r.comm_nm
|
||||
data << r.gujia_bld_id
|
||||
data << r.bld_id
|
||||
data << r.gujia_bld_nm
|
||||
data << r.gujia_unit_id
|
||||
data << r.unit_id
|
||||
data << r.gujia_unit_nm
|
||||
data << r.gujia_acc_id
|
||||
data << r.gujia_dtl_adr
|
||||
data << r.gujia_bld_yr_rc
|
||||
data << r.gujia_own_val
|
||||
data << r.gujia_own_yrlmt_val
|
||||
data << r.gujia_prd_val
|
||||
data << r.gujia_wbt_floor
|
||||
data << r.gujia_lyr_tp_val
|
||||
data << r.gujia_tot_floor_num
|
||||
data << r.gujia_bld_tp_val
|
||||
data << r.gujia_bld_stc
|
||||
data << r.gujiaconstructionarea
|
||||
data << r.gujia_set_innr_area
|
||||
data << r.gujia_acc_tp_val
|
||||
data << r.gujia_room
|
||||
data << r.gujia_dept
|
||||
data << r.gujia_ktch_num
|
||||
data << r.gujia_toliet
|
||||
data << r.gujia_hs_use
|
||||
data << r.gujia_indr_stc_val
|
||||
data << r.gujia_twrd_val
|
||||
data << r.gujia_dcrt_sttn
|
||||
data << r.gujia_ases_bt_ln_num
|
||||
data << r.gujia_trdtckt_prc
|
||||
data << r.gujia_mdl_tot_prc
|
||||
data << r.gujia_dcl_tot_prc
|
||||
data << r.gujia_ases_tot_prc
|
||||
data << r.gujiasigntonlinectrid
|
||||
data << r.txn_dt
|
||||
data << r.gujia_txn_tp_val
|
||||
data << r.gujia_sell_pymtmod
|
||||
data << r.gujia_mdl_cyc
|
||||
data << r.gujiawthrext_lift_ind
|
||||
data << r.gujiagvlndfargrdnarea
|
||||
data << r.gujia_gv_lu_tbl_area
|
||||
data << r.gujia_gv_sun_tbl_area
|
||||
data << r.gujiagvbaywindow_area
|
||||
data << r.gujiagvarea_tower_flr
|
||||
data << r.gujia_gv_grg_area
|
||||
data << r.gujiagvundgdroom_area
|
||||
data << r.gujia_gv_othr_area
|
||||
data << r.gujia_hs_src_dtsrc
|
||||
data << r.intr_co_id
|
||||
data << r.intr_co_nm
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
data << r.gujia_mkdam
|
||||
data << r.gujia_data_tm
|
||||
allRows << data
|
||||
});
|
||||
return allRows
|
||||
}
|
||||
|
||||
|
||||
def exportBigdataForsale(publishDate, new_dists){
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def index = 0
|
||||
for(def city : citys){
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
|
||||
def allRows = []
|
||||
if(new_dists){
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql1 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_unitprc,gujia_tot_prc,gujia_sell_pymtmod,gujia_wbt_floor,gujia_tot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt_ind,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " +
|
||||
"from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and anc_tm>=to_date('${publishDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}";
|
||||
def rets1 = getHouseDatas(sql1)
|
||||
allRows.addAll(rets1)
|
||||
}else{
|
||||
def sql = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_unitprc,gujia_tot_prc,gujia_sell_pymtmod,gujia_wbt_floor,gujia_tot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt_ind,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " +
|
||||
"from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and anc_tm>=to_date('${publishDate}','yyyy-MM-dd')";
|
||||
allRows = getHouseDatas(sql)
|
||||
}
|
||||
if(allRows.size()>0){
|
||||
index = index + 1
|
||||
if(index == 1){
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
}else{
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if(new_dists){//补充被修区域的数据
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql2 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_unitprc,gujia_tot_prc,gujia_sell_pymtmod,gujia_wbt_floor,gujia_tot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt_ind,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " +
|
||||
"from "+database+".t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}"
|
||||
def rets2 = getHouseDatas(sql2)
|
||||
if(rets2.size()>0){
|
||||
FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true);
|
||||
}
|
||||
}
|
||||
println "BIGDATA_FORSALE_GJ 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload(null, fileName, curDate)
|
||||
println "BIGDATA_FORSALE_GJ 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def getHouseDatas(sql){
|
||||
def allRows = []
|
||||
def index = 0
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
index = index+1
|
||||
println r.urbn_nm +" "+index
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
data << r.gujia_sell_id
|
||||
data << r.gujia_listg_hs_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.gujia_comm_id
|
||||
data << r.comm_nm
|
||||
data << r.gujia_bld_id
|
||||
data << r.bld_id
|
||||
data << r.gujia_bld_nm
|
||||
data << r.gujia_unit_id
|
||||
data << r.unit_id
|
||||
data << r.gujia_unit_nm
|
||||
data << r.gujia_acc_id
|
||||
data << r.gujia_dtl_adr
|
||||
data << r.gujia_bld_yr_rc
|
||||
data << r.gujia_own_val
|
||||
data << r.gujia_own_yrlmt_val
|
||||
data << r.gujia_unitprc
|
||||
data << r.gujia_tot_prc
|
||||
data << r.gujia_sell_pymtmod
|
||||
data << r.gujia_wbt_floor
|
||||
data << r.gujia_tot_floor_num
|
||||
data << r.gujia_bld_tp_val
|
||||
data << r.gujia_indr_stc_val
|
||||
data << r.gujia_bld_stc
|
||||
data << r.gujiaconstructionarea
|
||||
data << r.gujia_set_innr_area
|
||||
data << r.gujia_acc_tp_val
|
||||
data << r.gujia_room
|
||||
data << r.gujia_dept
|
||||
data << r.gujia_ktch_num
|
||||
data << r.gujia_toliet
|
||||
data << r.gujia_twrd_val
|
||||
data << r.gujia_dcrt_sttn
|
||||
data << r.gujiawthrext_lift_ind
|
||||
data << r.gujiajiladderjiactval
|
||||
data << r.anc_tm
|
||||
data << r.exdat
|
||||
data << r.gujia_wthr_strt_ind
|
||||
data << r.gujia_hs_src_dtsrc
|
||||
data << r.intr_co_id
|
||||
data << r.intr_co_nm
|
||||
data << r.gujia_anc_psn
|
||||
data << r.gujia_anc_psn_tel
|
||||
data << r.gujia_dsc_inf_cntnt
|
||||
data << r.rmrk_dsc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
data << r.gujia_apd_inf
|
||||
allRows << data
|
||||
// if(allRows.size()%200000==0){
|
||||
// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
|
||||
// allRows.clear()
|
||||
// }
|
||||
});
|
||||
return allRows
|
||||
}
|
||||
|
||||
|
||||
def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend);
|
||||
println tableName+" 数据文件输出完成......"
|
||||
// CcbFtpUtils.ftpUpload(null, fileName, curDate)
|
||||
// println tableName+" 上传Ftp完成......"
|
||||
}
|
||||
}
|
||||
+382
@@ -0,0 +1,382 @@
|
||||
package com.fangjia.script.ccbevaluation.pgsql
|
||||
|
||||
import com.fangjia.script.ccbevaluation.CcbCommonUtils
|
||||
import com.fangjia.script.ccbevaluation.CcbFtpUtils
|
||||
import com.fangjia.script.ccbevaluation.ronghe.SSHHelper
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.jcraft.jsch.ChannelSftp
|
||||
import groovy.sql.Sql
|
||||
import org.apache.commons.codec.digest.DigestUtils
|
||||
|
||||
class ExportPgsqlEvaluationResult {
|
||||
|
||||
def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/postgres",
|
||||
"postgres", "postgres", "org.postgresql.Driver")
|
||||
def citys = null
|
||||
def cityCodeMap = CcbCommonUtils.findCityCodeValue()
|
||||
|
||||
def database = "t_app_p9pha_plda."
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28";
|
||||
def linux_prefix = "/home/goojia/ccb_data/evaluation/"
|
||||
def win_prefix = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\evaluation\\${curDate}\\"
|
||||
|
||||
static main(args) {
|
||||
def task = new ExportPgsqlEvaluationResult()
|
||||
task.run(args)
|
||||
}
|
||||
|
||||
def run(args) {
|
||||
citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM"));
|
||||
|
||||
//计算结果相关
|
||||
// exportAvmEvaluationGJNB(curMonth)
|
||||
// exportAVMEvaluationItemGJNB(curMonth)
|
||||
//
|
||||
// exportCityPrice(curMonth)
|
||||
// exportRegionPrice(curMonth)
|
||||
//
|
||||
// exportCommunityBasePrice(curMonth)
|
||||
//
|
||||
// exportCommunityPdescribeGj(curMonth)
|
||||
// exportCommCaseDetailGj(curMonth)
|
||||
//
|
||||
def curDate = curMonth.toString()+"28"
|
||||
// 生成MD5文件
|
||||
exportMd5()
|
||||
SSHHelper jschCommand = new SSHHelper();
|
||||
System.out.println(jschCommand.executeCommand("sh /home/ccb/output/gz_package.sh ${curDate}"));
|
||||
// ok文件
|
||||
exportOkFile()
|
||||
}
|
||||
|
||||
def exportAvmEvaluationGJNB(yearMonth){
|
||||
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_yrmo,gujia_comm_num,gujia_val_comm_num,gujia_prc_cvr_rate,gujiamnldrcprccommnum,gujia_mnl_drc_prc_pct,gujia_samp_comm_num,gujiaext_samp_clc_pct,gujianervethruncomnum,gujianervethrunclcpct,gujia_tst_case_num,gujia_tst_comm_num,gujiatst_comm_num_pct,gujia_ppe15_cvr_rate,gujia_rto_mdn,gujia_rto_lv_san_ceft,gujiamdl_tst_case_num,gujiamdl_tst_comm_num,gujiamdltstcommnumpct,gujiamdltst_ppe15_pct,gujiamdlrtolvsan_ceft,gujia_mdl_md_bit_rto,gujiatrdpttstcase_num,gujiatrdpttstcomm_num,gujiatrdpttcommnumpct,gujiatrdpttstppe15pct,gujiatrdptrolvsanceft,gujiatrdpt_md_bit_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_evaluation_gj_h where gujia_yrmo = ${yearMonth} and urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_yrmo
|
||||
data << r.gujia_comm_num
|
||||
data << r.gujia_val_comm_num
|
||||
data << r.gujia_prc_cvr_rate
|
||||
data << r.gujiamnldrcprccommnum
|
||||
data << r.gujia_mnl_drc_prc_pct
|
||||
data << r.gujia_samp_comm_num
|
||||
data << r.gujiaext_samp_clc_pct
|
||||
data << r.gujianervethruncomnum
|
||||
data << r.gujianervethrunclcpct
|
||||
data << r.gujia_tst_case_num
|
||||
data << r.gujia_tst_comm_num
|
||||
data << r.gujiatst_comm_num_pct
|
||||
data << r.gujia_ppe15_cvr_rate
|
||||
data << r.gujia_rto_mdn
|
||||
data << r.gujia_rto_lv_san_ceft
|
||||
data << r.gujiamdl_tst_case_num
|
||||
data << r.gujiamdl_tst_comm_num
|
||||
data << r.gujiamdltstcommnumpct
|
||||
data << r.gujiamdltst_ppe15_pct
|
||||
data << r.gujiamdlrtolvsan_ceft
|
||||
data << r.gujia_mdl_md_bit_rto
|
||||
data << r.gujiatrdpttstcase_num
|
||||
data << r.gujiatrdpttstcomm_num
|
||||
data << r.gujiatrdpttcommnumpct
|
||||
data << r.gujiatrdpttstppe15pct
|
||||
data << r.gujiatrdptrolvsanceft
|
||||
data << r.gujiatrdpt_md_bit_rto
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28";
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
|
||||
def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat"
|
||||
fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("AVM_EVALUATION_GJNB", allRows, fileName, curDate, false)
|
||||
createFileToFtp("AVM_EVALUATION_GJ", allRows, fileName1, curDate, false)
|
||||
}
|
||||
|
||||
def exportAVMEvaluationItemGJNB(yearMonth){
|
||||
|
||||
def allRows = []
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_rgon_id,gujia_rgon_nm,gujia_comm_id,gujia_comm_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_avprc,gujia_clc_tp_val,gujia_rlb,gujia_to_mkprc_mny, to_char(mdl_dt,'yyyy-mm-dd') as mdl_dt,gujia_valt_unitprc,gujia_area,gujia_dcrt_val,gujia_twrd_val,gujia_wbt_floor,gujia_tot_floor,gujia_data_tp,gujia_rto,gujia_mns_rto, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm from "+database+"avm_evaluation_item_gj_h where gujia_clc_yrmo = ${yearMonth} AND urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_rgon_id
|
||||
data << r.gujia_rgon_nm
|
||||
data << r.gujia_comm_id
|
||||
data << r.gujia_comm_nm
|
||||
data << r.gujia_clc_yrmo
|
||||
data << r.gujia_clc_avprc
|
||||
data << r.gujia_avprc
|
||||
data << r.gujia_clc_tp_val
|
||||
data << r.gujia_rlb
|
||||
data << r.gujia_to_mkprc_mny
|
||||
data << r.mdl_dt
|
||||
data << r.gujia_valt_unitprc
|
||||
data << r.gujia_area
|
||||
data << r.gujia_dcrt_val
|
||||
data << r.gujia_twrd_val
|
||||
data << r.gujia_wbt_floor
|
||||
data << r.gujia_tot_floor
|
||||
data << r.gujia_data_tp
|
||||
data << r.gujia_rto
|
||||
data << r.gujia_mns_rto
|
||||
data << r.data_crt_tm
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
|
||||
def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat"
|
||||
fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
|
||||
createFileToFtp("AVM_EVALUATION_ITEM_GJNB",allRows, fileName, curDate, false)
|
||||
createFileToFtp("AVM_EVALUATION_ITEM_GJ",allRows, fileName1, curDate, false)
|
||||
}
|
||||
|
||||
def exportCityPrice(month){
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_city_price_gj_h where gujia_clc_yrmo=${month} AND urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_trdpt_avprc_id
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_clc_yrmo
|
||||
data << r.gujia_clc_avprc
|
||||
data << r.gujia_urbn_avprc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("CITY_PRICE_GJ",allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportRegionPrice(month){
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_admndiv_id,gxda_admndiv_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_district_price_gj_h where gujia_clc_yrmo=${month} AND urbn_id='${cityCode}'";
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_trdpt_avprc_id
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gxda_admndiv_nm
|
||||
data << r.gujia_clc_yrmo
|
||||
data << r.gujia_clc_avprc
|
||||
data << r.gujia_urbn_avprc
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
|
||||
createFileToFtp("DISTRICT_PRICE_GJ",allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportCommunityBasePrice(yearMonth){
|
||||
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujia_clc_yrmo,gujia_clc_avprc,gujia_comm_basic_prc,gujia_clmtd_val,gujia_fwd_samp_rto,gujia_mns_grd,gujia_cfdrg,gujiaarndcommprc_crlt,gujia_cfdc_dgr_val,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where gujia_clc_yrmo=${yearMonth} AND urbn_id='${cityCode}'";
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_bss_prc_id
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.gujia_admndiv_id
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.gujia_bds_id
|
||||
data << r.comm_nm
|
||||
data << r.gujia_clc_yrmo
|
||||
data << r.gujia_clc_avprc
|
||||
data << r.gujia_comm_basic_prc
|
||||
data << r.gujia_clmtd_val
|
||||
data << r.gujia_fwd_samp_rto
|
||||
data << r.gujia_mns_grd
|
||||
data << r.gujia_cfdrg
|
||||
data << r.gujiaarndcommprc_crlt
|
||||
data << r.gujia_cfdc_dgr_val
|
||||
data << r.data_crt_tm
|
||||
data << r.data_udt_tm
|
||||
data << r.gujia_src_co
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
|
||||
def fileName1 = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
|
||||
fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
createFileToFtp("COMMUNITY_BASE_PRICE_GJNB",allRows, fileName, curDate, false)
|
||||
createFileToFtp("COMMUNITY_BASE_PRICE_GJ",allRows, fileName1, curDate, false)
|
||||
}
|
||||
|
||||
def exportCommunityPdescribeGj(month){
|
||||
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bss_prc,gujia_cfdc_dgr_grd,gujiart3mlistgcasenum,gujialistgcaselwstprc,gujialistgcase_md_val,gujia_listg_case_avg,gujialistgcasemax_prc,gujiaavprc_crpnd_s_mo,gujiaavgwithminvalavg,gujiaavgwithmaxvalavg,gujia_rel_err,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujia_lmth_bss_prc,gujia_wthr_mnl_ind,gujia_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujianervethruntw_prc,gujia_prc_src,gujiaabtjanlcmdbitval,gujiaabtjanligcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujia_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujia_idxn_mo_moonmo,gujiaabt1yiminmmoonmo,gujia_idxn_yr_moonmo,gujiaabt1yr_samp_scvl,gujiaarnd1kscommavprc from "+database+"avm_community_p_describe_gj_h where gujiaavprc_crpnd_s_mo=${month} AND urbn_id='${cityCode}'";
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
data << r.gujia_comm_id
|
||||
data << r.urbn_id
|
||||
data << r.urbn_nm
|
||||
data << r.admndiv_ecd
|
||||
data << r.gujia_admndiv_nm
|
||||
data << r.comm_nm
|
||||
data << r.gujia_als_dsc
|
||||
data << r.gujia_bss_prc
|
||||
data << r.gujia_cfdc_dgr_grd
|
||||
data << r.gujiart3mlistgcasenum
|
||||
data << r.gujialistgcaselwstprc
|
||||
data << r.gujialistgcase_md_val
|
||||
data << r.gujia_listg_case_avg
|
||||
data << r.gujialistgcasemax_prc
|
||||
data << r.gujiaavprc_crpnd_s_mo
|
||||
data << r.gujiaavgwithminvalavg
|
||||
data << r.gujiaavgwithmaxvalavg
|
||||
data << r.gujia_rel_err
|
||||
data << r.gujia_dvtdgr_dsc
|
||||
data << r.gujia_als_prc_rng
|
||||
data << r.gujiaprcminandmax_rng
|
||||
data << r.gujia_dsc
|
||||
data << r.gujia_lmth_bss_prc
|
||||
data << r.gujia_wthr_mnl_ind
|
||||
data << r.gujia_lmth_fnl_prc
|
||||
data << r.data_crt_tm
|
||||
data << r.gujianervethruntw_prc
|
||||
data << r.gujia_prc_src
|
||||
data << r.gujiaabtjanlcmdbitval
|
||||
data << r.gujiaabtjanligcaseavg
|
||||
data << r.gujia_indx_lbl
|
||||
data << r.gujia_prim_pty_tp
|
||||
data << r.gujia_comm_tp_val
|
||||
data << r.gujia_ltst_mdl_prc
|
||||
data << r.gujia_ltst_mdl_dt
|
||||
data << r.gujia_idxn_mo_moonmo
|
||||
data << r.gujiaabt1yiminmmoonmo
|
||||
data << r.gujia_idxn_yr_moonmo
|
||||
data << r.gujiaabt1yr_samp_scvl
|
||||
data << r.gujiaarnd1kscommavprc
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
createFileToFtp("community_p_describe_gj",allRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
def exportCommCaseDetailGj(month){
|
||||
def fileName = linux_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
for(def city : citys){
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = "select gujia_fsid, urbn_id, gujia_comm_id, gujia_case_id,crterm,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm from "+database+"avm_comm_case_detail_gj_h where urbn_id='${cityCode}' and crterm=${month}";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
data << r.urbn_id
|
||||
data << r.gujia_comm_id
|
||||
data << r.gujia_case_id
|
||||
data << r.crterm
|
||||
data << r.data_crt_tm
|
||||
allRows << data
|
||||
if(allRows.size()%200000==0){
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
|
||||
allRows.clear()
|
||||
}
|
||||
});
|
||||
if(allRows.size()>0){
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true);
|
||||
}
|
||||
}
|
||||
CcbFtpUtils.ftpUpload(null, fileName, curDate)
|
||||
}
|
||||
|
||||
def exportMd5(){
|
||||
Vector files = CcbFtpUtils.listFileNames(curDate)
|
||||
Iterator fileVec = files.iterator()
|
||||
def fileRows = []
|
||||
while(fileVec.hasNext()){
|
||||
ChannelSftp.LsEntry file = fileVec.next()
|
||||
if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){
|
||||
fileRows << file.getFilename() +":"+ DigestUtils.md5Hex(file.getFilename())
|
||||
}
|
||||
}
|
||||
def fileName = linux_prefix + "md5.txt"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = win_prefix + "md5.txt"
|
||||
}
|
||||
createFileToFtp("md5.txt",fileRows, fileName, curDate, false)
|
||||
}
|
||||
|
||||
|
||||
def exportOkFile(){
|
||||
def dataCodeFileName = linux_prefix + "${curDate}.ok"
|
||||
if(CommonDatautils.isWindow()){
|
||||
dataCodeFileName = win_prefix + "${curDate}.ok"
|
||||
}
|
||||
createFileToFtp("ok txt", [], dataCodeFileName, curDate, false)
|
||||
}
|
||||
|
||||
|
||||
def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend);
|
||||
println tableName+" 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload(null, fileName, curDate)
|
||||
// println tableName+" 上传Ftp完成......"
|
||||
}
|
||||
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.fangjia.script.ccbevaluation.pgsql
|
||||
|
||||
class ExportPgsqlRonghe {
|
||||
|
||||
static main(args) {
|
||||
def task = new ExportPgsqlRonghe()
|
||||
task.run(args)
|
||||
}
|
||||
|
||||
def run(args) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+629
@@ -0,0 +1,629 @@
|
||||
package com.fangjia.script.ccbevaluation.ronghe
|
||||
|
||||
import com.fangjia.script.BaseBatch
|
||||
import com.fangjia.script.ccbevaluation.CcbCommonUtils
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.common.DataHandleUtils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.ElasticUtils
|
||||
import com.mongodb.BasicDBObject
|
||||
import com.mongodb.DBObject
|
||||
import org.apache.commons.lang.StringUtils
|
||||
import org.elasticsearch.index.query.BoolQueryBuilder
|
||||
import org.elasticsearch.index.query.QueryBuilder
|
||||
import org.elasticsearch.index.query.QueryBuilders
|
||||
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.ExecutorService
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.atomic.AtomicLong
|
||||
|
||||
class BigdataCitypriceBatch extends BaseBatch{
|
||||
|
||||
public static final String[] TAGS = ["独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"];
|
||||
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80)
|
||||
|
||||
static main(args) {
|
||||
runBatch(new BigdataCitypriceBatch(), args)
|
||||
}
|
||||
|
||||
@Override
|
||||
void process(Object args) {
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
|
||||
def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date(),-1), "yyyyMMdd").toInteger();
|
||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
|
||||
cityRun(citys, startDate, endDate, cityCodeDataMap)
|
||||
regionRun(citys, startDate, endDate, cityCodeDataMap)
|
||||
districtRun(citys, startDate, endDate, cityCodeDataMap)
|
||||
}
|
||||
|
||||
def cityRun(citys, startDate, endDate, cityCodeDataMap){
|
||||
def rets = []
|
||||
def index = 0
|
||||
for(def city : citys){
|
||||
index ++
|
||||
def row = createDatas(city, null, startDate, endDate, cityCodeDataMap, null)
|
||||
if(row){
|
||||
rets << row
|
||||
}
|
||||
println "[ ${index} ]"+city+" 完成 "
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10";
|
||||
def fileName = "/ccb/MODEL_000000_000000_BIGDATA_CITYPRICE.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_CITYPRICE.dat"
|
||||
}
|
||||
def headers = []
|
||||
FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false);
|
||||
println "BIGDATA_CITYPRICE 数据文件输出完成......"
|
||||
}
|
||||
|
||||
|
||||
def regionRun(citys, startDate, endDate, cityCodeDataMap){
|
||||
def regionDatas = []
|
||||
for(def c : citys) {
|
||||
def regionMap = CcbCommonUtils.findAllDistrictCodeValue(c)
|
||||
regionMap.each{region, regionCodeDataMap->
|
||||
regionDatas << [c, region, regionCodeDataMap]
|
||||
}
|
||||
}
|
||||
|
||||
def rets = new CopyOnWriteArrayList()
|
||||
def size = regionDatas.size()
|
||||
final CountDownLatch latch = new CountDownLatch(size)
|
||||
def totalCount = new AtomicLong()
|
||||
for(def i = 0;i<regionDatas.size();i++){
|
||||
final def arr = regionDatas[i]
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
void run() {
|
||||
try {
|
||||
totalCount.addAndGet(1)
|
||||
println totalCount.get() +" /${size} "+arr[0] + " "+ arr[1]
|
||||
def row = createDatas(arr[0], arr[1], startDate, endDate, cityCodeDataMap, arr[2])
|
||||
if(row){
|
||||
rets << row
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
latch.countDown()
|
||||
}
|
||||
};
|
||||
})
|
||||
}
|
||||
latch.await()
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10";
|
||||
def fileName = "/ccb/MODEL_000000_000000_BIGDATA_DISTPRICE.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTPRICE.dat"
|
||||
}
|
||||
def headers = []
|
||||
FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false);
|
||||
println "BIGDATA_DISTPRICE 数据文件输出完成......"
|
||||
}
|
||||
|
||||
def districtRun(citys, startDate, endDate, cityCodeDataMap){
|
||||
def rets = []
|
||||
def allDistricts = []
|
||||
def allPriceMap = [:]
|
||||
def allRentMap = [:]
|
||||
for(def city : citys) {
|
||||
def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat","address", "alias"]);
|
||||
allDistricts.addAll(districts)
|
||||
|
||||
def priceMap = CommonDatautils.queryDistrictStatByDate(city, startDate, endDate)
|
||||
allPriceMap = allPriceMap + priceMap
|
||||
|
||||
def rentMap = CommonDatautils.findSqmetreRentByCityAndDate(city, endDate)
|
||||
allRentMap = allRentMap + rentMap
|
||||
|
||||
}
|
||||
|
||||
def cityLists = districtRunningByCity(allDistricts, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap)
|
||||
if(cityLists){
|
||||
rets.addAll(cityLists)
|
||||
}
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10";
|
||||
def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMPRICE.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMPRICE.dat"
|
||||
}
|
||||
def headers = []
|
||||
FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false);
|
||||
println "BIGDATA_COMMPRICE 数据文件输出完成......"
|
||||
}
|
||||
|
||||
def districtRunningByCity(districts, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap){
|
||||
def totalCount = new AtomicLong()
|
||||
def distCount = districts.size()
|
||||
final CountDownLatch latch = new CountDownLatch(distCount)
|
||||
|
||||
def rets = new CopyOnWriteArrayList()
|
||||
for(def i=0;i<districts.size();i++){
|
||||
final def dist = districts[i];
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
void run() {
|
||||
try {
|
||||
totalCount.addAndGet(1)
|
||||
def row = createDistDate(dist, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap)
|
||||
if(row){
|
||||
rets << row
|
||||
println totalCount.get() +"/"+distCount + dist.city+" "+dist.region+" "+dist.name+" "+row[4]+" "+row[6]
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
latch.countDown()
|
||||
}
|
||||
};
|
||||
})
|
||||
}
|
||||
latch.await()
|
||||
return rets;
|
||||
}
|
||||
|
||||
|
||||
def createDistDate(dist, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap){
|
||||
def sellDataType = 1
|
||||
def rentDataType = 1
|
||||
def sellMap = findHouses(dist.city, dist.region, "sell", startDate, endDate, dist.name, dist.alias, dist.estate_type2)
|
||||
def sell_avg_price = null
|
||||
def sell_avg_area = null
|
||||
def sell_avg_total = null
|
||||
def sellStartDate = null
|
||||
def sell_count = 0
|
||||
if(!sellMap || (sellMap && sellMap.avg_price.size()<3)){
|
||||
sellDataType = 3
|
||||
sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
|
||||
sellMap = findHouses(dist.city, dist.region, "sell", sellStartDate, endDate, dist.name, dist.alias, dist.estate_type2)
|
||||
if(!sellMap || (sellMap && sellMap.avg_price.size()<3)){
|
||||
sellDataType = 6
|
||||
sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
|
||||
sellMap = findHouses(dist.city, dist.region, "sell", sellStartDate, endDate, dist.name, dist.alias, dist.estate_type2)
|
||||
}
|
||||
}
|
||||
if(sellMap){
|
||||
sell_count = sellMap.avg_price.size()
|
||||
if(sell_count>3){
|
||||
sell_avg_price = avgValue(sellMap.avg_price)
|
||||
sell_avg_area = avgValue(sellMap.area)
|
||||
sell_avg_total = avgValue(sellMap.total_price)
|
||||
}else{
|
||||
sell_count = 0
|
||||
sellDataType = null
|
||||
}
|
||||
}
|
||||
|
||||
def rent_avg_price = null
|
||||
def rent_avg_area = null
|
||||
def rent_avg_total = null
|
||||
def rentStartDate = null
|
||||
def rent_count = 0
|
||||
def rentMap = findHouses(dist.city, dist.region, "rent", startDate, endDate, dist.name, dist.alias, dist.estate_type2)
|
||||
if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){
|
||||
rentDataType = 3
|
||||
rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
|
||||
rentMap = findHouses(dist.city, dist.region, "rent", rentStartDate, endDate, dist.name, dist.alias, dist.estate_type2)
|
||||
if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){
|
||||
rentDataType = 6
|
||||
rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
|
||||
rentMap = findHouses(dist.city, dist.region, "rent", rentStartDate, endDate, dist.name, dist.alias, dist.estate_type2)
|
||||
}
|
||||
}
|
||||
if(rentMap){
|
||||
rent_count = rentMap.avg_price.size()
|
||||
if(rent_count>3){
|
||||
rent_avg_price = avgValue(rentMap.avg_price)
|
||||
rent_avg_area = avgValue(rentMap.area)
|
||||
rent_avg_total = avgValue(rentMap.total_price)
|
||||
}else{
|
||||
rent_count = 0
|
||||
rentDataType = null
|
||||
}
|
||||
}
|
||||
if(!sell_avg_price){
|
||||
sell_avg_price = allPriceMap.get(dist.city +"##"+ dist.region +"##"+ dist.name)
|
||||
}
|
||||
if(!rent_avg_price){
|
||||
rent_avg_price = allRentMap.get(dist.city +"##"+ dist.region +"##"+ dist.name)
|
||||
}
|
||||
if (sell_avg_price || rent_avg_price) {
|
||||
def row = []
|
||||
row << cityCodeDataMap.get(dist.city)
|
||||
row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
|
||||
row << dist._id.toString()
|
||||
|
||||
if (sell_avg_price) {
|
||||
row << sell_avg_price.toInteger()
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
row << sell_count
|
||||
|
||||
if (rent_avg_price) {
|
||||
row << DataHandleUtils.getDoubleRound(2, rent_avg_price)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
row << rent_count
|
||||
|
||||
row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
|
||||
|
||||
if (sell_avg_area) {
|
||||
row << DataHandleUtils.getDoubleRound(2, sell_avg_area)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (rent_avg_area) {
|
||||
row << DataHandleUtils.getDoubleRound(2, rent_avg_area)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (sell_avg_total) {
|
||||
row << DataHandleUtils.getDoubleRound(2, sell_avg_total)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (rent_avg_total) {
|
||||
row << DataHandleUtils.getDoubleRound(2, rent_avg_total)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
if(dist.estate_type2 && dist.estate_type2=="商住"){
|
||||
row << '11'
|
||||
}else{
|
||||
row << '13'
|
||||
}
|
||||
|
||||
if(sellDataType){
|
||||
row << sellDataType
|
||||
}else{
|
||||
row << ''
|
||||
}
|
||||
|
||||
if(rentDataType){
|
||||
row << rentDataType
|
||||
}else{
|
||||
row << ''
|
||||
}
|
||||
|
||||
row << 1
|
||||
row << 'FJW'
|
||||
return row
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
def createDatas(city, region , startDate, endDate, cityCodeDataMap, regionCodeDataMap) {
|
||||
def sellDataType = 1
|
||||
def rentDataType = 1
|
||||
def sell_count = findHouseCountByType(city, region, "sell", startDate, endDate)
|
||||
def sell_avg_price = null
|
||||
def sell_avg_area = null
|
||||
def sell_avg_total = null
|
||||
def sellStartDate = null
|
||||
if (sell_count < 10) {
|
||||
sellDataType = 3
|
||||
sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
|
||||
sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate)
|
||||
if (sell_count < 10) {
|
||||
sellDataType = 6
|
||||
sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
|
||||
sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate)
|
||||
}
|
||||
} else {
|
||||
sellStartDate = startDate
|
||||
}
|
||||
if (sell_count) {
|
||||
sell_avg_price = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"avg_price")
|
||||
sell_avg_area = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"area")
|
||||
sell_avg_total = findHouseAvgByType(city, region, "sell", sellStartDate, endDate, "total_price")
|
||||
}
|
||||
|
||||
|
||||
def rentStartDate = null
|
||||
def rent_count = findHouseCountByType(city, region, "rent", startDate, endDate)
|
||||
if (rent_count < 10) {
|
||||
rentDataType = 3
|
||||
rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger();
|
||||
rent_count = findHouseCountByType(city, region, "sell", startDate, endDate)
|
||||
if (rent_count < 10) {
|
||||
rentDataType = 6
|
||||
rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger();
|
||||
rent_count = findHouseCountByType(city, region, "sell", rentStartDate, endDate)
|
||||
}
|
||||
} else {
|
||||
rentStartDate = startDate
|
||||
}
|
||||
|
||||
def rent_avg_price = null
|
||||
def rent_avg_area = null
|
||||
def rent_avg_total = null
|
||||
if (rent_count>=10) {
|
||||
rent_avg_price = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "avg_price")
|
||||
rent_avg_area = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "area")
|
||||
rent_avg_total = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "total_price")
|
||||
}
|
||||
|
||||
println city +" "+region +" sell: "+ sell_count +" rent: "+rent_count
|
||||
|
||||
if (sell_avg_price || rent_avg_price) {
|
||||
def row = []
|
||||
row << cityCodeDataMap.get(city)
|
||||
row << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger();
|
||||
|
||||
if(region){
|
||||
row << regionCodeDataMap.district_code
|
||||
}
|
||||
|
||||
if (sell_avg_price) {
|
||||
row << sell_avg_price.toInteger()
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (rent_avg_price) {
|
||||
row << DataHandleUtils.getDoubleRound(2, rent_avg_price)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
row << sell_count
|
||||
row << rent_count
|
||||
row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
|
||||
row << '11'
|
||||
|
||||
if (sell_avg_area) {
|
||||
row << DataHandleUtils.getDoubleRound(2, sell_avg_area)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (rent_avg_area) {
|
||||
row << DataHandleUtils.getDoubleRound(2, rent_avg_area)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (sell_avg_total) {
|
||||
row << DataHandleUtils.getDoubleRound(2, sell_avg_total)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
if (rent_avg_total) {
|
||||
row << DataHandleUtils.getDoubleRound(2, rent_avg_total)
|
||||
} else {
|
||||
row << ''
|
||||
}
|
||||
|
||||
row << 1
|
||||
row << sellDataType
|
||||
row << rentDataType
|
||||
row << 'FJW'
|
||||
return row
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
def avgValue(def datas){
|
||||
def avgValue = null
|
||||
if(datas){
|
||||
avgValue = datas.sum()/datas.size()
|
||||
}
|
||||
return avgValue;
|
||||
}
|
||||
|
||||
def findHouseAvgByType(def city, def region, def cat, def startDate, def endDate, def type){
|
||||
String sql = "select avg(${type}) as avg_val from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} "
|
||||
if(region){
|
||||
sql = sql +" and region='${region}'"
|
||||
}
|
||||
def val = null
|
||||
ElasticUtils.executeSqlQuery(sql, { d ->
|
||||
val = d.avg_val
|
||||
})
|
||||
return val;
|
||||
}
|
||||
|
||||
def findHouseCountByType(def city, def region, def cat, def startDate, def endDate){
|
||||
String sql = "select count(1) as count from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} "
|
||||
if(region){
|
||||
sql = sql +" and region='${region}'"
|
||||
}
|
||||
def val = null
|
||||
ElasticUtils.executeSqlQuery(sql, { d ->
|
||||
val = d.count
|
||||
})
|
||||
return val;
|
||||
}
|
||||
|
||||
def findHouseDetail(def city, def region, def cat, def startDate, def endDate, def estate_type2){
|
||||
|
||||
String sql = "select estate_type,area,avg_price,total_price,name,height,room c from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} "
|
||||
if(region){
|
||||
sql = sql +" and region='${region}'"
|
||||
}
|
||||
def avgPrices = []
|
||||
def areas = []
|
||||
def totalPrices = []
|
||||
ElasticUtils.executeSqlQuery(sql,{ seawater->
|
||||
def flag = true
|
||||
if(estate_type2 && estate_type2=="普通住宅"){
|
||||
if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){
|
||||
flag = false
|
||||
}
|
||||
|
||||
if(seawater.estate_type&& seawater.estate_type.contains("别墅")){
|
||||
flag = false
|
||||
}
|
||||
|
||||
def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
|
||||
if(vallaFlag){
|
||||
flag = false
|
||||
}
|
||||
}
|
||||
if(cat == "rent"){
|
||||
if(seawater.avg_price && seawater.avg_price>1000){
|
||||
flag = false
|
||||
}
|
||||
|
||||
if(seawater.avg_price && seawater.avg_price<10){
|
||||
flag = false
|
||||
}
|
||||
}
|
||||
if(flag){
|
||||
avgPrices << seawater.avg_price
|
||||
areas << seawater.area
|
||||
totalPrices << seawater.total_price
|
||||
}
|
||||
})
|
||||
def retMap = [:]
|
||||
if(areas){
|
||||
retMap.avg_price = avgPrices
|
||||
retMap.area = areas
|
||||
retMap.total_price = totalPrices
|
||||
}
|
||||
return retMap;
|
||||
}
|
||||
|
||||
|
||||
|
||||
def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){
|
||||
|
||||
QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(true).includeUpper(true);
|
||||
QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false);
|
||||
|
||||
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city))
|
||||
.must(QueryBuilders.termQuery("cat", cat)).must(date_range).must(area_range)
|
||||
|
||||
if(region){
|
||||
queryBuilder.must(QueryBuilders.termQuery("region", region))
|
||||
}
|
||||
|
||||
if(name || alias){
|
||||
if(!alias){
|
||||
alias = []
|
||||
}
|
||||
if(!alias.contains(name)){
|
||||
alias.add(name)
|
||||
}
|
||||
|
||||
if(name.contains("弄小区")){
|
||||
def newName = name.replace("弄小区","弄")
|
||||
if(!alias.contains(newName)){
|
||||
alias << newName
|
||||
}
|
||||
}
|
||||
|
||||
if(alias && alias.size()>0){
|
||||
BoolQueryBuilder inBuilder = QueryBuilders.boolQuery();
|
||||
for(def s : alias){
|
||||
inBuilder.should(QueryBuilders.matchQuery("district_name", s));
|
||||
}
|
||||
queryBuilder.must(inBuilder)
|
||||
}
|
||||
}
|
||||
|
||||
def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder);
|
||||
|
||||
def avgPrices = []
|
||||
def areas = []
|
||||
def totalPrices = []
|
||||
|
||||
if(houses){
|
||||
for (int k=0;k<houses.size();k++) {
|
||||
def map = houses[k];
|
||||
DBObject seawater = new BasicDBObject(map)
|
||||
|
||||
if(estate_type2 && estate_type2=="普通住宅"){
|
||||
if(seawater.estate_type && (seawater.estate_type.contains("商住") || seawater.estate_type.contains("商业") || seawater.estate_type.contains("商务"))){
|
||||
println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type
|
||||
continue;
|
||||
}
|
||||
|
||||
if(seawater.estate_type&& seawater.estate_type.contains("别墅")){
|
||||
println city +" "+name+" "+seawater._id.toString()+" "+seawater.estate_type
|
||||
continue;
|
||||
}
|
||||
|
||||
def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room)
|
||||
if(vallaFlag){
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if(cat == "rent"){
|
||||
if(seawater.avg_price && seawater.avg_price>1000){
|
||||
continue
|
||||
}
|
||||
|
||||
if(seawater.avg_price && seawater.avg_price<10){
|
||||
continue
|
||||
}
|
||||
}
|
||||
avgPrices << seawater.avg_price
|
||||
areas << seawater.area
|
||||
totalPrices << seawater.total_price
|
||||
}
|
||||
}
|
||||
|
||||
def retMap = [:]
|
||||
if(areas){
|
||||
retMap.avg_price = avgPrices
|
||||
retMap.area = areas
|
||||
retMap.total_price = totalPrices
|
||||
}
|
||||
return retMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否是别墅
|
||||
* @return
|
||||
*/
|
||||
public boolean isVilla(area, name, height, room) {
|
||||
if (area == null) {
|
||||
return false;
|
||||
}
|
||||
if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
boolean ret = false;
|
||||
if (height != null && room != null) {
|
||||
if (height <= 3) {
|
||||
if (area > 200 && room >= 5) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
} else if (height == null && room != null) {
|
||||
if (area > 360 && room >= 6) {
|
||||
ret = true;
|
||||
}
|
||||
} else if (height == null && room == null) {
|
||||
if (area > 500) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
+54
-54
@@ -31,7 +31,6 @@ class BigdataCommunityGJRHBatch extends BaseBatch {
|
||||
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80)
|
||||
|
||||
|
||||
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
|
||||
@@ -42,7 +41,8 @@ class BigdataCommunityGJRHBatch extends BaseBatch {
|
||||
|
||||
@Override
|
||||
public void process(Object args) {
|
||||
def citys = CcbCommonUtils.citys_all;
|
||||
def citys = CcbCommonUtils.getRunningCitys(args)
|
||||
|
||||
def rows = []
|
||||
def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
// for (def city : citys) {
|
||||
@@ -53,62 +53,62 @@ class BigdataCommunityGJRHBatch extends BaseBatch {
|
||||
// })
|
||||
// }
|
||||
|
||||
addBigdataDistrictFJW()
|
||||
// addBigdataDistrictFJW()
|
||||
|
||||
// def citySeqnoMap = CcbCommonUtils.findDistrictSeqno();
|
||||
def citySeqnoMap = CcbCommonUtils.findDistrictSeqno();
|
||||
|
||||
def index = 0
|
||||
for (def city : citys) {
|
||||
index++
|
||||
def districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
|
||||
//
|
||||
// def index = 0
|
||||
// for (def city : citys) {
|
||||
// index++
|
||||
// def districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
|
||||
////
|
||||
//// for(int i=0;i<10;i++){
|
||||
//// if(districts.size()==0){
|
||||
//// Thread.sleep(1000*60)
|
||||
//// districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
|
||||
//// }else{
|
||||
//// break
|
||||
//// }
|
||||
//// }
|
||||
//
|
||||
// def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge"])
|
||||
//
|
||||
// for(def dist : districts){
|
||||
// def obj = distMap.get(dist.commid)//CommonDatautils.findDistrictFieldById(dist.commid,["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"])
|
||||
// if(obj){
|
||||
// if(obj.alias && obj.alias.size()>0){
|
||||
// dist.commalias = obj.alias.get(0)
|
||||
// }else{
|
||||
// dist.commalias = ""
|
||||
// }
|
||||
// dist.buildstru = CcbCodeUtils.getBuildStructureCode(obj.build_structure)
|
||||
// dist.housetype = CcbCodeUtils.getDistHouseTypeCode(obj.estate_type2)
|
||||
// dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date);
|
||||
// dist.houseuse = "11"
|
||||
// dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type)
|
||||
// dist.compid = new ObjectId() //物业公司id
|
||||
// dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2)
|
||||
// for(int i=0;i<10;i++){
|
||||
// if(districts.size()==0){
|
||||
// Thread.sleep(1000*60)
|
||||
// districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city))
|
||||
// }else{
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
// println index +" "+city +" 小区加载完成 "+districts.size()
|
||||
// addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city))
|
||||
// println index +" "+city +" 1.小区表完成"
|
||||
// addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city))
|
||||
// println index +" "+city +" 2.小区建筑结构表"
|
||||
// addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city))
|
||||
// println index +" "+city +" 3.小区房屋类型表"
|
||||
// addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city))
|
||||
// println index +" "+city +" 4.小区建筑年代表"
|
||||
// addBigdataCommfeeGj(districts, cityCodeDataMap.get(city))
|
||||
// println index +" "+city +" 5.小区费用表"
|
||||
// addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city))
|
||||
// println index +" "+city +" 6.小区房屋用途表"
|
||||
// addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap)
|
||||
// println index +" "+ city + " 7.地理位置表"
|
||||
//
|
||||
//// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//修改成交记录housestyle 一定要运行
|
||||
//
|
||||
// }
|
||||
|
||||
def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge"])
|
||||
|
||||
for(def dist : districts){
|
||||
def obj = distMap.get(dist.commid)//CommonDatautils.findDistrictFieldById(dist.commid,["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"])
|
||||
if(obj){
|
||||
if(obj.alias && obj.alias.size()>0){
|
||||
dist.commalias = obj.alias.get(0)
|
||||
}else{
|
||||
dist.commalias = ""
|
||||
}
|
||||
dist.buildstru = CcbCodeUtils.getBuildStructureCode(obj.build_structure)
|
||||
dist.housetype = CcbCodeUtils.getDistHouseTypeCode(obj.estate_type2)
|
||||
dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date);
|
||||
dist.houseuse = CcbCodeUtils.getUseTypeCode(obj.estate_type2)//"11"
|
||||
dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type)
|
||||
dist.compid = new ObjectId() //物业公司id
|
||||
dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2)
|
||||
}
|
||||
}
|
||||
println index +" "+city +" 小区加载完成 "+districts.size()
|
||||
addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city))
|
||||
println index +" "+city +" 1.小区表完成"
|
||||
addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city))
|
||||
println index +" "+city +" 2.小区建筑结构表"
|
||||
addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city))
|
||||
println index +" "+city +" 3.小区房屋类型表"
|
||||
addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city))
|
||||
println index +" "+city +" 4.小区建筑年代表"
|
||||
addBigdataCommfeeGj(districts, cityCodeDataMap.get(city))
|
||||
println index +" "+city +" 5.小区费用表"
|
||||
addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city))
|
||||
println index +" "+city +" 6.小区房屋用途表"
|
||||
addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap)
|
||||
println index +" "+ city + " 7.地理位置表"
|
||||
|
||||
// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//修改成交记录housestyle 一定要运行
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
def addBigdataCommunityGJRH(def districts, def cityid){
|
||||
|
||||
+372
-41
@@ -4,10 +4,12 @@ import com.fangjia.script.BaseBatch
|
||||
import com.fangjia.script.BatchOwner
|
||||
import com.fangjia.script.Watcher
|
||||
import com.fangjia.script.ccbevaluation.CcbCommonUtils
|
||||
import com.fangjia.script.ccbevaluation.CcbFtpTestUtils
|
||||
import com.fangjia.script.ccbevaluation.CcbFtpUtils
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.jcraft.jsch.ChannelSftp
|
||||
import groovy.sql.Sql
|
||||
|
||||
import java.sql.ResultSet
|
||||
@@ -28,10 +30,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
@Override
|
||||
void process(Object args) {
|
||||
citys = CcbCommonUtils.getRunningCitys(args)
|
||||
def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
|
||||
def new_dists = []//["350604","350605","410307","410308","450181"]
|
||||
//按天导(每天一个文件夹)
|
||||
exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists)
|
||||
//按天导(每天一个文件夹)
|
||||
exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists)
|
||||
|
||||
if(curDate.toString().endsWith("10")){
|
||||
exportBigdataCommunityGJRH()//
|
||||
@@ -49,6 +52,19 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
exportBigdataBuildprojFjw()
|
||||
exportBigdataCommlayoutpicFjw()
|
||||
exportEvaluateRate()
|
||||
|
||||
// //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输
|
||||
def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM"));
|
||||
exportThirdPartyPrice2(thirdPartyMonth, new_dists)
|
||||
|
||||
|
||||
//1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据
|
||||
exportCommunityBasePrice(lastMonth)
|
||||
exportCommunityPdescribeGj(lastMonth)
|
||||
exportGuideStatistics(lastMonth)
|
||||
exportBigdataSupplierStatistics(lastMonth)
|
||||
exportBigdataModelingBase(lastMonth)
|
||||
|
||||
}
|
||||
SSHHelper jschCommand = new SSHHelper();
|
||||
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
|
||||
@@ -63,14 +79,14 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
//
|
||||
//
|
||||
//// //检查ok文件是否上传
|
||||
//// //检查ok文件是否上传
|
||||
//// exportAllBigdataDealFJW()
|
||||
//// for(def city : citys) {
|
||||
//// def cityCode = cityCodeDataMap.get(city)
|
||||
////
|
||||
// //按天导(一个文件夹下)
|
||||
// //按天导(一个文件夹下)
|
||||
// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
|
||||
// //按天导(每天一个文件夹)
|
||||
// //按天导(每天一个文件夹)
|
||||
// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
|
||||
//
|
||||
//// exportBigdataCommunityGJRH(cityCode)
|
||||
@@ -103,7 +119,7 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
def index = 0
|
||||
for(def city : citys){
|
||||
@@ -145,9 +161,9 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
}
|
||||
|
||||
}
|
||||
println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......"
|
||||
println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......"
|
||||
}
|
||||
def exportBigdataCommbuildstruGJ(){
|
||||
def allRows = []
|
||||
@@ -170,11 +186,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommhousetypeGJ(){
|
||||
@@ -199,11 +215,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommbuildyearGj(){
|
||||
@@ -227,11 +243,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommfeeGj(){
|
||||
@@ -265,11 +281,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMFEE_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMFEE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
@@ -295,11 +311,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataPositionGJ(){
|
||||
@@ -328,11 +344,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_POSITION_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_POSITION_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataDistrictFJW(){
|
||||
@@ -360,11 +376,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "BIGDATA_DISTRICT_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_DISTRICT_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataAliasFJW(){
|
||||
@@ -395,11 +411,11 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "ADDRESS_ALIAS_FJW 上传Ftp完成......"
|
||||
println "ADDRESS_ALIAS_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataDealFJW(dealdate){
|
||||
@@ -419,7 +435,7 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
|
||||
}
|
||||
|
||||
def allRows = []
|
||||
@@ -504,7 +520,7 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}"
|
||||
println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}"
|
||||
def curEndStr = DateUtils.add(curStartStr, 1)
|
||||
curStartDateStr = curEndStr
|
||||
}
|
||||
@@ -519,14 +535,14 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
|
||||
def allRows = []
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
if(curDate.toString().endsWith("28")){
|
||||
if(curDate.toString().endsWith("10")){
|
||||
if(new_dists){
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql1 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " +
|
||||
@@ -541,14 +557,14 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
allRows.addAll(rets2)
|
||||
}else{
|
||||
def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//
|
||||
allRows = createDeal(sql)
|
||||
allRows.addAll(createDeal(sql))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}"
|
||||
println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}"
|
||||
}
|
||||
|
||||
def createDeal(sql){
|
||||
@@ -709,10 +725,10 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
println "BIGDATA_DEAL_FJW 导出完成......"
|
||||
println "BIGDATA_DEAL_FJW 导出完成......"
|
||||
}
|
||||
|
||||
|
||||
@@ -720,7 +736,7 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
def index = 0
|
||||
for(def city : citys) {
|
||||
@@ -770,7 +786,7 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
}
|
||||
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_BUILDING_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_BUILDING_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
@@ -794,40 +810,355 @@ class ExportDistrictRongHe extends BaseBatch{
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "EVALUATE_RATE_FJW 上传Ftp完成......"
|
||||
println "EVALUATE_RATE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportThirdPartyPrice2(price_date, new_dists) {
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10";
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
if (CommonDatautils.isWindow()) {
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
def index = 0
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def allRows = []
|
||||
if(new_dists) {
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql1 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " +
|
||||
"COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " +
|
||||
"CITYID='${cityCode}' and price_date=${price_date} and distid not in ${newstr} ";
|
||||
def rets1 = getThirdPartyDatas(sql1)
|
||||
allRows.addAll(rets1)
|
||||
|
||||
def sql2 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " +
|
||||
"COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " +
|
||||
"CITYID='${cityCode}' and distid in ${newstr} ";
|
||||
def rets2 = getThirdPartyDatas(sql2)
|
||||
allRows.addAll(rets2)
|
||||
}else{
|
||||
def sql = null
|
||||
if(CcbCommonUtils.citys_92.contains(city)){
|
||||
sql = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where CITYID='${cityCode}' and price_date=${price_date} ";
|
||||
}else{
|
||||
sql = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where CITYID='${cityCode}'";
|
||||
}
|
||||
allRows = getThirdPartyDatas(sql)
|
||||
}
|
||||
if(allRows && allRows.size()>0){
|
||||
index = index + 1
|
||||
if(index==1){
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
}else{
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
println "BIGDATA_THIRD_PARTY_PRICE_GJ 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload('rh', fileName, curDate)
|
||||
}
|
||||
|
||||
def getThirdPartyDatas(def sql){
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.DISTID
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.DATA_SOURCE_ID
|
||||
data << r.DATA_SOURCE
|
||||
data << r.PRICE_DATE
|
||||
data << r.COMMUNITY_PRICE
|
||||
data << r.COMMUNITY_MAX_PRICE
|
||||
data << r.COMMUNITY_MIN_PRICE
|
||||
data << r.UPDATETIME
|
||||
allRows << data
|
||||
})
|
||||
return allRows;
|
||||
}
|
||||
|
||||
def exportBigdataBuildprojFjw(){
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportCommunityBasePrice(yearMonth){
|
||||
|
||||
def allRows = []
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = null;
|
||||
if(CcbCommonUtils.citys_92.contains(city)){
|
||||
sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth} AND CITYID='${cityCode}'";
|
||||
}else{
|
||||
sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where CITYID='${cityCode}'";
|
||||
}
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.CALC_AVG_PRICE
|
||||
data << r.AVG_PRICE
|
||||
data << r.CALC_TYPE
|
||||
data << r.FAKE_RATE
|
||||
data << r.DIFF_RATE
|
||||
data << r.CONFI_RATE
|
||||
data << r.CORR_RATE
|
||||
data << r.CONFIDENCE
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
def exportCommunityPdescribeGj(month){
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
def allRows = []
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = null;
|
||||
if(CcbCommonUtils.citys_92.contains(city)){
|
||||
sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time=${month} AND CITYID='${cityCode}'";
|
||||
}else{
|
||||
sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where CITYID='${cityCode}'";
|
||||
}
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.COMMUNITY_ID
|
||||
data << r.CITYID
|
||||
data << r.CITY_NAME
|
||||
data << r.DISTRICT_CODE
|
||||
data << r.DISTRICT_NAME
|
||||
data << r.COMMUNITY_NAME
|
||||
data << r.PQ_NAME
|
||||
data << r.BASE_PRICE
|
||||
data << r.CONFIDENCE_LEVEL
|
||||
data << r.CNT
|
||||
data << r.MIN_PRICE
|
||||
data << r.MEDIANPRICE
|
||||
data << r.MEANPRICE
|
||||
data << r.MAX_PRICE
|
||||
data << r.TIME
|
||||
data << r.FIRSTDATAT
|
||||
data << r.THIRDDATA
|
||||
data << r.RELATIVEERROR
|
||||
data << r.SKEWNESS
|
||||
data << r.PQ_PRICE_RANGE
|
||||
data << r.DISTRICT_PRICE_RANGE
|
||||
data << r.DESCRIPTION
|
||||
data << r.PRIV_BASE_PRICE
|
||||
data << r.IS_ARTTFICIAL
|
||||
data << r.PRIV_FINAL_PRICE
|
||||
data << r.CREATE_DATE
|
||||
data << r.PRICE
|
||||
data << r.PRICE_SOURCE
|
||||
data << r.CASE_MD_PRICE
|
||||
data << r.CASE_AVG_PRICE
|
||||
data << r.INDEX_LABEL
|
||||
data << r.MAIN_PROPERTY
|
||||
data << r.COMMTYPE
|
||||
data << r.NEW_DEAL_PRICE
|
||||
data << r.NEW_DEAL_DATE
|
||||
data << r.PRICE_MOM_RATIO
|
||||
data << r.MAX_MOM_RATIO
|
||||
data << r.PRICE_YOY_RATIO
|
||||
data << r.SATUR_RATIO
|
||||
data << r.NEIGHBOR_PRICE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
println allRows.size()
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
|
||||
println "community_p_describe_gj 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "community_p_describe_gj 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportGuideStatistics(time){
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
def allRows = []
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = null;
|
||||
if(CcbCommonUtils.citys_92.contains(city)){
|
||||
sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}' and year_month=${time}";
|
||||
}else{
|
||||
sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}'";
|
||||
}
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.MODEL_TYPE
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.COMM_SUM_COUNT
|
||||
data << r.COMM_COUNT
|
||||
data << r.RATIO
|
||||
data << r.TYPE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
println allRows.size()
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
|
||||
println "guide_statistics 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "guide_statistics 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
def exportBigdataSupplierStatistics(time){
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
def allRows = []
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = null;
|
||||
if(CcbCommonUtils.citys_92.contains(city)){
|
||||
sql = "select CITYID,CITYNAME,YEAR_MONTH,DATA_SOURCE,THIRD_COMM_COUNT,MODEL_TYPE from BIGDATA_SUPPLIER_STATISTICS where cityid='${cityCode}' and year_month=${time}";
|
||||
}else{
|
||||
sql = "select CITYID,CITYNAME,YEAR_MONTH,DATA_SOURCE,THIRD_COMM_COUNT,MODEL_TYPE from BIGDATA_SUPPLIER_STATISTICS where cityid='${cityCode}'";
|
||||
}
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.DATA_SOURCE
|
||||
data << r.THIRD_COMM_COUNT
|
||||
data << r.MODEL_TYPE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
println allRows.size()
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
|
||||
println "bigdata_supplier_statistics 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "bigdata_supplier_statistics 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataModelingBase(time){
|
||||
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
def headers = []
|
||||
def allRows = []
|
||||
|
||||
for(def city : citys) {
|
||||
def cityCode = cityCodeMap.get(city)
|
||||
def sql = null;
|
||||
if(CcbCommonUtils.citys_92.contains(city)){
|
||||
sql = "select CITY_CODE,CITYNAME,YEAR_MONTH,ESTIMATE_DEAL_COUNT,ESTIMATE_COMM_COUNT,DEAL_COUNT,DEAL_COMM_COUNT,SALE_COUNT,SALE_COMM_COUNT,MODEL_TYPE,TYPE from BIGDATA_MODELING_BASE where city_code='${cityCode}' and year_month=${time}";
|
||||
}else{
|
||||
sql = "select CITY_CODE,CITYNAME,YEAR_MONTH,ESTIMATE_DEAL_COUNT,ESTIMATE_COMM_COUNT,DEAL_COUNT,DEAL_COMM_COUNT,SALE_COUNT,SALE_COMM_COUNT,MODEL_TYPE,TYPE from BIGDATA_MODELING_BASE where city_code='${cityCode}'";
|
||||
}
|
||||
|
||||
sqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.CITY_CODE
|
||||
data << r.CITYNAME
|
||||
data << r.YEAR_MONTH
|
||||
data << r.ESTIMATE_DEAL_COUNT
|
||||
data << r.ESTIMATE_COMM_COUNT
|
||||
data << r.DEAL_COUNT
|
||||
data << r.DEAL_COMM_COUNT
|
||||
data << r.SALE_COUNT
|
||||
data << r.SALE_COMM_COUNT
|
||||
data << r.MODEL_TYPE
|
||||
data << r.TYPE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
println allRows.size()
|
||||
FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false);
|
||||
|
||||
println "bigdata_modeling_base 数据文件输出完成......"
|
||||
CcbFtpUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "bigdata_modeling_base 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
|
||||
def exportBigdataCommlayoutpicFjw(){
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......"
|
||||
println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportOk(curDate){
|
||||
// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
|
||||
def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok"
|
||||
if(CommonDatautils.isWindow()){
|
||||
dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
|
||||
dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
|
||||
}
|
||||
FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
|
||||
CcbFtpUtils.ftpUpload("rh",dataCodeFileName, curDate)
|
||||
|
||||
+522
-303
File diff suppressed because it is too large
Load Diff
+747
@@ -0,0 +1,747 @@
|
||||
package com.fangjia.script.ccbevaluation.ronghe
|
||||
|
||||
import com.fangjia.script.BaseBatch
|
||||
import com.fangjia.script.BatchOwner
|
||||
import com.fangjia.script.Watcher
|
||||
import com.fangjia.script.ccbevaluation.CcbCommonUtils
|
||||
import com.fangjia.script.ccbevaluation.CcbFtpTestUtils
|
||||
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import groovy.sql.Sql
|
||||
|
||||
import java.sql.ResultSet
|
||||
import java.sql.ResultSetMetaData
|
||||
|
||||
@BatchOwner(Watcher.GaoJuan)
|
||||
class ExportDistrictRongHeTest extends BaseBatch{
|
||||
|
||||
def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl",
|
||||
"GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver")
|
||||
static main(args) {
|
||||
runBatch(new ExportDistrictRongHeTest(), args);
|
||||
}
|
||||
|
||||
@Override
|
||||
void process(Object args) {
|
||||
def curDate = 20220310//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd")
|
||||
def fileName = "/ccb_rh/${curDate}"
|
||||
// if(CommonDatautils.isWindow()){
|
||||
// fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}"
|
||||
// }
|
||||
CcbFtpTestUtils.delete(fileName)
|
||||
|
||||
exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"))
|
||||
|
||||
exportBigdataCommunityGJRH()
|
||||
exportBigdataBuildingFJW()
|
||||
exportBigdataCommfeeGj()
|
||||
|
||||
exportBigdataCommbuildstruGJ()
|
||||
exportBigdataCommhousetypeGJ()
|
||||
exportBigdataCommbuildyearGj()
|
||||
exportBigdataCommhouseuseGJ()
|
||||
exportBigdataPositionGJ()
|
||||
exportBigdataDistrictFJW()
|
||||
exportBigdataAliasFJW()
|
||||
|
||||
exportBigdataBuildprojFjw()
|
||||
exportBigdataCommlayoutpicFjw()
|
||||
exportEvaluateRate()
|
||||
|
||||
SSHHelper jschCommand = new SSHHelper();
|
||||
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
|
||||
|
||||
exportOk(curDate)
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
// def runByCity(){
|
||||
// def citys = CcbCommonUtils.citys;
|
||||
// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue()
|
||||
//
|
||||
//
|
||||
//// //检查ok文件是否上传
|
||||
//// exportAllBigdataDealFJW()
|
||||
//// for(def city : citys) {
|
||||
//// def cityCode = cityCodeDataMap.get(city)
|
||||
////
|
||||
// //按天导(一个文件夹下)
|
||||
// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
|
||||
// //按天导(每天一个文件夹)
|
||||
// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd"))
|
||||
//
|
||||
//// exportBigdataCommunityGJRH(cityCode)
|
||||
//// exportBigdataBuildingFJW(cityCode)
|
||||
//// exportBigdataCommfeeGj(cityCode)
|
||||
////
|
||||
//// exportBigdataCommbuildstruGJ(cityCode)
|
||||
//// exportBigdataCommhousetypeGJ(cityCode)
|
||||
//// exportBigdataCommbuildyearGj(cityCode)
|
||||
//// exportBigdataCommhouseuseGJ(cityCode)
|
||||
//// exportBigdataPositionGJ(cityCode)
|
||||
//// exportBigdataDistrictFJW(cityCode)
|
||||
//// exportBigdataAliasFJW(cityCode)
|
||||
////
|
||||
//// exportBigdataBuildprojFjw(cityCode)
|
||||
//// exportBigdataCommlayoutpicFjw(cityCode)
|
||||
//// }
|
||||
//// exportEvaluateRate()
|
||||
//
|
||||
////
|
||||
// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
|
||||
// SSHHelper jschCommand = new SSHHelper();
|
||||
// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));
|
||||
//
|
||||
// exportOk()
|
||||
// }
|
||||
|
||||
def exportBigdataCommunityGJRH(cityCode){
|
||||
def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.COMMALIAS
|
||||
data << r.DISTID
|
||||
data << r.STREET
|
||||
data << r.STREETNO
|
||||
data << r.ADDRESS
|
||||
data << r.LANDAREA
|
||||
data << r.BUILDAREA
|
||||
data << r.COMMTYPE
|
||||
data << r.IFNEW
|
||||
data << r.GREENINGRATE
|
||||
data << r.PLOTRATIO
|
||||
data << r.PARKINGCNT
|
||||
data << ''
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
println "BIGDATA_COMMUNITY_FJW 数据文件输出完成......"
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMUNITY_FJW 上传Ftp完成......"
|
||||
}
|
||||
def exportBigdataCommbuildstruGJ(){
|
||||
def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.COMMID
|
||||
data << r.BUILDSTRU
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommhousetypeGJ(cityCode){
|
||||
def sql = "select CITYID,COMMID,HOUSETYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSETYPE_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.COMMID
|
||||
data << r.HOUSETYPE
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommbuildyearGj(){
|
||||
def sql = "select CITYID,COMMID,BUILDYEAR,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDYEAR_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.COMMID
|
||||
data << r.BUILDYEAR
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommfeeGj(){
|
||||
def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMFEE_FJW";//where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.COMMID
|
||||
data << r.COMPID
|
||||
data << r.FEE
|
||||
data << r.HOUSEUSE
|
||||
if(r.BUILDTYPE){
|
||||
def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
|
||||
data << arrs[0].trim()
|
||||
}else{
|
||||
data << ''
|
||||
}
|
||||
data << r.FEETYPE
|
||||
data << r.NOTE
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMFEE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
def exportBigdataCommhouseuseGJ(){
|
||||
def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSEUSE_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.COMMID
|
||||
data << r.HOUSEUSE
|
||||
data << r.HOUSECNT
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataPositionGJ(){
|
||||
def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_POSITION_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.OBJECTTYPE
|
||||
data << r.OBJECTID
|
||||
data << r.POSITIONTYPE
|
||||
data << r.SEQNO
|
||||
data << r.LONGITUDE
|
||||
data << r.LATITUDE
|
||||
data << r.ALTITUDE
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_POSITION_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataDistrictFJW(){
|
||||
def sql = "select DISTID,DISTNAME,DISTSPELL,CITYID,DISTCODE,SEQ,DISTTYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_DISTRICT_FJW";// where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.DISTSPELL
|
||||
data << r.CITYID
|
||||
data << r.DISTCODE
|
||||
data << r.SEQ
|
||||
data << r.DISTTYPE
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "BIGDATA_DISTRICT_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataAliasFJW(){
|
||||
def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW";// where city_id='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.city_id
|
||||
data << r.ca_id
|
||||
data << r.address_id
|
||||
data << r.address_name
|
||||
data << r.status
|
||||
data << r.exp_dt
|
||||
data << r.version
|
||||
data << r.is_key_name
|
||||
data << r.data_source
|
||||
data << r.description
|
||||
data << r.alias_grade
|
||||
data << r.addr_type_cd
|
||||
data << r.ifexamine
|
||||
data << r.ifdisplay
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "ADDRESS_ALIAS_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataDealFJW(dealdate){
|
||||
|
||||
def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
|
||||
def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
|
||||
def stop = false
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def index = 0
|
||||
|
||||
def curStartDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()),"yyyy-MM-dd")
|
||||
def curSndDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date()),"yyyy-MM-dd")
|
||||
|
||||
while(!stop){
|
||||
index++
|
||||
def curStartStr = curStartDateStr
|
||||
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat"
|
||||
}
|
||||
|
||||
def allRows = []
|
||||
if(index==1){
|
||||
def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.DEALID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.STREET
|
||||
data << r.STREETNO
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.BUILDID
|
||||
data << r.BUILDNO
|
||||
data << r.BUILDNAME
|
||||
data << r.UNITID
|
||||
data << r.UNITNO
|
||||
data << r.UNITNAME
|
||||
data << r.HOUSEID
|
||||
data << r.ADDRESS
|
||||
data << r.BUILDYEAR
|
||||
data << r.PROPTYPE
|
||||
data << r.PROPYEARS
|
||||
data << r.PERIODNUM
|
||||
data << r.FLOORNUM
|
||||
data << r.FLOORTYPE
|
||||
data << r.FLOORCNT
|
||||
if(r.BUILDTYPE){
|
||||
def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
|
||||
data << arrs[0].trim()
|
||||
}else{
|
||||
data << ''
|
||||
}
|
||||
data << r.BUILDSTRU
|
||||
data << r.BUILDAREA
|
||||
data << r.LIVINGAREA
|
||||
data << r.HOUSESTYLE
|
||||
data << r.ROOMCNT
|
||||
data << r.LIVINGROOMCNT
|
||||
data << r.KITCHENCNT
|
||||
data << r.BATHROOMCNT
|
||||
data << r.HOUSEUSE
|
||||
data << r.HOUSESTRU
|
||||
data << r.HOUSEASPECT
|
||||
data << r.FITMENT
|
||||
data << r.EVALUATENO
|
||||
data << r.DEALUNITPRICE
|
||||
data << r.DEALTOTALPRICE
|
||||
data << r.DECLAREPRICE
|
||||
data << r.EVALUATEPRICE
|
||||
data << r.CONTRACTNO
|
||||
data << r.DEALDATE
|
||||
data << r.DEALTYPE
|
||||
data << r.PAYTYPE
|
||||
data << r.DEALPERIOD
|
||||
data << r.IFELEVATOR
|
||||
data << r.COMPAREAGARDEN
|
||||
data << r.COMPAREATERRACE
|
||||
data << r.COMPAREABALCONY
|
||||
data << r.COMPAREABAYWINDOW
|
||||
data << r.COMPAREAATTIC
|
||||
data << r.COMPAREAGARAGE
|
||||
data << r.COMPAREABASEMENT
|
||||
data << r.COMPAREAOTHER
|
||||
data << r.DATASOURCE
|
||||
data << r.AGENCYID
|
||||
data << r.AGENCYNAME
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME1
|
||||
data << r.UPDATETIME1
|
||||
data << r.SOURCECODE
|
||||
data << r.WORKDATE
|
||||
allRows << data
|
||||
});
|
||||
}
|
||||
if(curStartDateStr == curSndDateStr){
|
||||
stop = true
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh", fileName, curDate)
|
||||
println "BIGDATA_DEAL_FJW 上传Ftp完成......${curStartStr}"
|
||||
def curEndStr = DateUtils.add(curStartStr, 1)
|
||||
curStartDateStr = curEndStr
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
def exportBigdataDealFJW2(curDate, dealdate){
|
||||
|
||||
def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
|
||||
def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd")
|
||||
// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
|
||||
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
|
||||
def allRows = []
|
||||
def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.DEALID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.STREET
|
||||
data << r.STREETNO
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.BUILDID
|
||||
data << r.BUILDNO
|
||||
data << r.BUILDNAME
|
||||
data << r.UNITID
|
||||
data << r.UNITNO
|
||||
data << r.UNITNAME
|
||||
data << r.HOUSEID
|
||||
data << r.ADDRESS
|
||||
data << r.BUILDYEAR
|
||||
data << r.PROPTYPE
|
||||
data << r.PROPYEARS
|
||||
data << r.PERIODNUM
|
||||
data << r.FLOORNUM
|
||||
data << r.FLOORTYPE
|
||||
data << r.FLOORCNT
|
||||
if(r.BUILDTYPE){
|
||||
def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
|
||||
data << arrs[0].trim()
|
||||
}else{
|
||||
data << ''
|
||||
}
|
||||
data << r.BUILDSTRU
|
||||
data << r.BUILDAREA
|
||||
data << r.LIVINGAREA
|
||||
data << r.HOUSESTYLE
|
||||
data << r.ROOMCNT
|
||||
data << r.LIVINGROOMCNT
|
||||
data << r.KITCHENCNT
|
||||
data << r.BATHROOMCNT
|
||||
data << r.HOUSEUSE
|
||||
data << r.HOUSESTRU
|
||||
data << r.HOUSEASPECT
|
||||
data << r.FITMENT
|
||||
data << r.EVALUATENO
|
||||
data << r.DEALUNITPRICE
|
||||
data << r.DEALTOTALPRICE
|
||||
data << r.DECLAREPRICE
|
||||
data << r.EVALUATEPRICE
|
||||
data << r.CONTRACTNO
|
||||
data << r.DEALDATE
|
||||
data << r.DEALTYPE
|
||||
data << r.PAYTYPE
|
||||
data << r.DEALPERIOD
|
||||
data << r.IFELEVATOR
|
||||
data << r.COMPAREAGARDEN
|
||||
data << r.COMPAREATERRACE
|
||||
data << r.COMPAREABALCONY
|
||||
data << r.COMPAREABAYWINDOW
|
||||
data << r.COMPAREAATTIC
|
||||
data << r.COMPAREAGARAGE
|
||||
data << r.COMPAREABASEMENT
|
||||
data << r.COMPAREAOTHER
|
||||
data << r.DATASOURCE
|
||||
data << r.AGENCYID
|
||||
data << r.AGENCYNAME
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME1
|
||||
data << r.UPDATETIME1
|
||||
data << r.SOURCECODE
|
||||
data << r.WORKDATE
|
||||
allRows << data
|
||||
});
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_DEAL_FJW 上传Ftp完成......${endDateStr}"
|
||||
}
|
||||
|
||||
def exportAllBigdataDealFJW(){
|
||||
def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where DEALDATE<to_date('2021-12-01','yyyy-MM-dd')";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.DEALID
|
||||
data << r.CITYNAME
|
||||
data << r.DISTID
|
||||
data << r.DISTNAME
|
||||
data << r.STREET
|
||||
data << r.STREETNO
|
||||
data << r.COMMID
|
||||
data << r.COMMNAME
|
||||
data << r.BUILDID
|
||||
data << r.BUILDNO
|
||||
data << r.BUILDNAME
|
||||
data << r.UNITID
|
||||
data << r.UNITNO
|
||||
data << r.UNITNAME
|
||||
data << r.HOUSEID
|
||||
data << r.ADDRESS
|
||||
data << r.BUILDYEAR
|
||||
data << r.PROPTYPE
|
||||
data << r.PROPYEARS
|
||||
data << r.PERIODNUM
|
||||
data << r.FLOORNUM
|
||||
data << r.FLOORTYPE
|
||||
data << r.FLOORCNT
|
||||
if(r.BUILDTYPE){
|
||||
def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
|
||||
data << arrs[0].trim()
|
||||
}else{
|
||||
data << ''
|
||||
}
|
||||
data << r.BUILDSTRU
|
||||
data << r.BUILDAREA
|
||||
data << r.LIVINGAREA
|
||||
data << r.HOUSESTYLE
|
||||
data << r.ROOMCNT
|
||||
data << r.LIVINGROOMCNT
|
||||
data << r.KITCHENCNT
|
||||
data << r.BATHROOMCNT
|
||||
data << r.HOUSEUSE
|
||||
data << r.HOUSESTRU
|
||||
data << r.HOUSEASPECT
|
||||
data << r.FITMENT
|
||||
data << r.EVALUATENO
|
||||
data << r.DEALUNITPRICE
|
||||
data << r.DEALTOTALPRICE
|
||||
data << r.DECLAREPRICE
|
||||
data << r.EVALUATEPRICE
|
||||
data << r.CONTRACTNO
|
||||
data << r.DEALDATE
|
||||
data << r.DEALTYPE
|
||||
data << r.PAYTYPE
|
||||
data << r.DEALPERIOD
|
||||
data << r.IFELEVATOR
|
||||
data << r.COMPAREAGARDEN
|
||||
data << r.COMPAREATERRACE
|
||||
data << r.COMPAREABALCONY
|
||||
data << r.COMPAREABAYWINDOW
|
||||
data << r.COMPAREAATTIC
|
||||
data << r.COMPAREAGARAGE
|
||||
data << r.COMPAREABASEMENT
|
||||
data << r.COMPAREAOTHER
|
||||
data << r.DATASOURCE
|
||||
data << r.AGENCYID
|
||||
data << r.AGENCYNAME
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME1
|
||||
data << r.UPDATETIME1
|
||||
data << r.SOURCECODE
|
||||
data << r.WORKDATE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
println "BIGDATA_DEAL_FJW 导出完成......"
|
||||
}
|
||||
|
||||
|
||||
def exportBigdataBuildingFJW(cityCode){
|
||||
def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW";//where CITYID='${cityCode}'
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.CITYID
|
||||
data << r.BUILDID
|
||||
data << r.BUILDNO
|
||||
data << r.BUILDNAME
|
||||
data << r.BUILDALIAS
|
||||
data << r.DISTID
|
||||
data << r.COMMID
|
||||
data << r.BUILDYEAR
|
||||
if(r.BUILDTYPE){
|
||||
def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",")
|
||||
data << arrs[0].trim()
|
||||
}else{
|
||||
data << ''
|
||||
}
|
||||
data << r.BUILDSTRU
|
||||
data << r.FLOORCNT
|
||||
data << r.UNITCNT
|
||||
data << r.HOUSECNT
|
||||
data << r.IFELEVATOR
|
||||
data << r.ELEVATORCNT
|
||||
data << r.ELEVATORHOUSE
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
data << r.VALID_FLAG
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_BUILDING_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
|
||||
|
||||
def exportEvaluateRate(){
|
||||
def sql = "select ID, RATE_TYPE, RATE, RANK, CITY, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from EVALUATE_RATE_FJW";
|
||||
def allRows = []
|
||||
sqlInstance.eachRow(sql,{r->
|
||||
def data = []
|
||||
data << r.ID
|
||||
data << r.RATE_TYPE
|
||||
data << r.RATE
|
||||
data << r.RANK
|
||||
data << r.CITY
|
||||
data << r.REMARK
|
||||
data << r.CREATETIME
|
||||
data << r.UPDATETIME
|
||||
data << r.SOURCECODE
|
||||
allRows << data
|
||||
});
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "EVALUATE_RATE_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataBuildprojFjw(){
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_BUILDPROJ_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportBigdataCommlayoutpicFjw(){
|
||||
def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10"
|
||||
def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
|
||||
if(CommonDatautils.isWindow()){
|
||||
fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat"
|
||||
}
|
||||
FileUtils.batchCreateFile([], fileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",fileName, curDate)
|
||||
println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完成......"
|
||||
}
|
||||
|
||||
def exportOk(curDate){
|
||||
// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")
|
||||
def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok"
|
||||
if(CommonDatautils.isWindow()){
|
||||
dataCodeFileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\${curDate}.ok"
|
||||
}
|
||||
FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false);
|
||||
CcbFtpTestUtils.ftpUpload("rh",dataCodeFileName, curDate)
|
||||
}
|
||||
|
||||
}
|
||||
+112
@@ -0,0 +1,112 @@
|
||||
package com.fangjia.script.ccbevaluation.ronghe
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
|
||||
import com.jcraft.jsch.ChannelExec;
|
||||
import com.jcraft.jsch.JSch;
|
||||
import com.jcraft.jsch.Session
|
||||
|
||||
import com.jcraft.jsch.*;
|
||||
|
||||
|
||||
class SSHHelperTest {
|
||||
|
||||
private Session session = null;
|
||||
private Channel channel = null;
|
||||
|
||||
private String sftpHost = "192.168.0.45";
|
||||
private int sftpPort = 17495;
|
||||
private String sftpUserName = "ccb";
|
||||
private String sftpPassword = "ccb!@#";
|
||||
private int timeout = 30000;
|
||||
/**
|
||||
* 获取连接
|
||||
* @return
|
||||
*/
|
||||
private ChannelExec getChannelExec() {
|
||||
try {
|
||||
if (channel != null && channel.isConnected()) {
|
||||
return (ChannelExec) channel;
|
||||
}
|
||||
JSch jSch = new JSch();
|
||||
if (session == null || !session.isConnected()) {
|
||||
session = jSch.getSession(sftpUserName, sftpHost, sftpPort);
|
||||
session.setPassword(sftpPassword);
|
||||
Properties config = new Properties();
|
||||
config.put("StrictHostKeyChecking", "no");
|
||||
session.setConfig(config);
|
||||
session.setTimeout(timeout);
|
||||
session.connect();
|
||||
}
|
||||
channel = session.openChannel("exec");
|
||||
} catch (Exception e) {
|
||||
if (session != null) {
|
||||
session.disconnect();
|
||||
session = null;
|
||||
}
|
||||
channel = null;
|
||||
}
|
||||
return channel == null ? null : (ChannelExec) channel;
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭连接
|
||||
*/
|
||||
private void closeChannel() {
|
||||
try {
|
||||
if (channel != null) {
|
||||
channel.disconnect();
|
||||
channel = null;
|
||||
}
|
||||
if (session != null) {
|
||||
session.disconnect();
|
||||
session = null;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行服务器端命令
|
||||
*/
|
||||
public boolean executeCommand(String command) {
|
||||
boolean flag = false;
|
||||
ChannelExec channelExec = getChannelExec();
|
||||
if (channelExec == null) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
channelExec.setInputStream(null);
|
||||
channelExec.setErrStream(System.err);
|
||||
channelExec.setCommand(command);
|
||||
|
||||
InputStream ins = channelExec.getInputStream();
|
||||
channelExec.connect();
|
||||
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(ins, "utf-8"));
|
||||
String line = null;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
System.out.println(line);
|
||||
}
|
||||
|
||||
reader.close();
|
||||
closeChannel();
|
||||
|
||||
flag = true;
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
flag = false;
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SSHHelperTest jschCommand = new SSHHelperTest();
|
||||
System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/package.sh 20220110"));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+87
-1
@@ -755,7 +755,7 @@ class CommonDatautils {
|
||||
q.put("visible",0)
|
||||
q.put("cat", cat);
|
||||
q.put("city", city);
|
||||
// q.put("name","şţĹĎźŃÔˇ")
|
||||
// q.put("name","Íò´ï»ª¸®Ò»ÆÚ")
|
||||
|
||||
DBObject keys = new BasicDBObject();
|
||||
if(fields){
|
||||
@@ -903,6 +903,36 @@ class CommonDatautils {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static def findSeaweedById(String id, def filelds){
|
||||
if(!id){
|
||||
return null;
|
||||
}
|
||||
try{
|
||||
DBObject q = new BasicDBObject();
|
||||
q.put("_id", new ObjectId(id.toString().replace("[","").replace("]","")));
|
||||
|
||||
DBObject keys = new BasicDBObject();
|
||||
filelds.each{
|
||||
keys.put(it, 1);
|
||||
}
|
||||
try{
|
||||
DSCursor cursor = getDataStoreConnection().find(q, keys);
|
||||
if(cursor){
|
||||
for(def obj : cursor){
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
}catch(Exception e){
|
||||
println "error_id:"+id
|
||||
e.printStackTrace()
|
||||
}
|
||||
}catch(Exception e){
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static def findDistrictBySid(String sid){
|
||||
@@ -1556,6 +1586,32 @@ class CommonDatautils {
|
||||
}
|
||||
return rets;
|
||||
}
|
||||
|
||||
|
||||
public static def queryDistrictStatByDate(city, startDate, endDate){
|
||||
DBObject q = new BasicDBObject()
|
||||
q.put("city", city);
|
||||
q.put('weekend', new BasicDBObject('$gte', DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd")).append('$lte', DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd")));
|
||||
def dbcursor = DIST_STAT_COLL.find(q).batchSize(5000)
|
||||
dbcursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT)
|
||||
def districtStatMap = [:]
|
||||
for(def d : dbcursor){
|
||||
def key = d.city +"##"+d.region+"##"+d.district_name
|
||||
def prices = districtStatMap.get(key)
|
||||
if(!prices){
|
||||
prices = []
|
||||
districtStatMap.put(key, prices)
|
||||
}
|
||||
prices << d.avg_price
|
||||
}
|
||||
|
||||
def priceMap = [:]
|
||||
districtStatMap.each{k,v->
|
||||
def price = v.sum()/v.size()
|
||||
priceMap.put(k, (int)price)
|
||||
}
|
||||
return priceMap;
|
||||
}
|
||||
|
||||
|
||||
public static def queryDistrictPrice(city, region, name, weekend, cat){
|
||||
@@ -1646,6 +1702,22 @@ class CommonDatautils {
|
||||
}
|
||||
|
||||
|
||||
public static def queryHouseCalutePrice(city, region, name, startWeekendDate){
|
||||
DBObject queryCondition = new BasicDBObject()
|
||||
queryCondition.put("city", city);
|
||||
queryCondition.put("region", region);
|
||||
queryCondition.put("district_name", name);
|
||||
queryCondition.put('weekend', new BasicDBObject('$gte', startWeekendDate));
|
||||
queryCondition.put("value_type", new BasicDBObject('$in', [1,2]));
|
||||
DBCursor cur = DIST_STAT_COLL.find(queryCondition).sort(new BasicDBObject().append("weekend", 1)).limit(1)
|
||||
def dbo = null;
|
||||
while(cur.hasNext()) {
|
||||
dbo = cur.next()
|
||||
}
|
||||
return dbo;
|
||||
}
|
||||
|
||||
|
||||
public static def queryDistrictPriceByWeekend(city, region, name, weekend, limit){
|
||||
DBObject queryCondition = new BasicDBObject()
|
||||
queryCondition.put("city", city);
|
||||
@@ -3290,6 +3362,20 @@ class CommonDatautils {
|
||||
return count;
|
||||
}
|
||||
|
||||
static def findSqmetreRentByCityAndDate(def city, def weekend){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
q.put("cat","district")
|
||||
q.put("weekend", DateUtils.parseFromTightByPattern(weekend.toString(), "yyyyMMdd"))
|
||||
def dbcursor = SQMETRE_RENT_COLL.find(q).batchSize(2000)
|
||||
dbcursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT)
|
||||
def sqmetreRentMap = [:]
|
||||
for(def d : dbcursor){
|
||||
sqmetreRentMap.put(d.city+"##"+d.region+"##"+d.district_name, d.avg_price)
|
||||
}
|
||||
return sqmetreRentMap;
|
||||
}
|
||||
|
||||
static def findNewSqmetreRent(def city, def region, def name){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
|
||||
+57
-7
@@ -31,6 +31,8 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
public static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com")
|
||||
public static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName("business", "fz_district", "mongo.db.fangjia.com")
|
||||
|
||||
static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com")
|
||||
|
||||
def specialDistsPriceMap = ["津泰新村7号、9-17号":53620,"津泰新村14号":76230,"津泰新村1-6号、8号":32580]
|
||||
static main(args) {
|
||||
runBatch(new DistrictPriceExportBatch(), args)
|
||||
@@ -41,11 +43,9 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
|
||||
def headers = ["id","comm_id","city","district","name","avg_price","year_month"]
|
||||
|
||||
def ret = createDatas("¸£ÖÝ")
|
||||
|
||||
def ret = createNewDatas("¸£ÖÝ")
|
||||
saveToDB(ret)
|
||||
|
||||
|
||||
def fileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".csv"
|
||||
def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512"
|
||||
if(CommonDatautils.isWindow()){
|
||||
@@ -98,11 +98,50 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
return rets
|
||||
}
|
||||
|
||||
|
||||
def createNewDatas(def city){
|
||||
def districts = getFzDistricts(city)
|
||||
def curPriceMap = findFzDistrictSellStat("¸£ÖÝ",curDate)
|
||||
def result = []
|
||||
for(def rMap : districts){
|
||||
def curPrice = 0
|
||||
def dbo = null
|
||||
if(curPriceMap.containsKey(rMap.get("_id").toString())){
|
||||
dbo = curPriceMap.get(rMap.get("_id").toString())
|
||||
curPrice = dbo.avg_price
|
||||
}else{
|
||||
curPrice = specialDistsPriceMap.get(rMap.name)
|
||||
if(curPrice){
|
||||
def randMarkup = nextDouble(0, 1)
|
||||
curPrice = (int)(curPrice*randMarkup/100 + curPrice)
|
||||
}
|
||||
}
|
||||
def m = []
|
||||
if(curPrice && dbo){
|
||||
m << dbo.get("_id").toString()//¾ù¼ÛID
|
||||
}else{
|
||||
m << new ObjectId().toString()
|
||||
}
|
||||
m << rMap.get("_id").toString()//Â¥ÅÌID
|
||||
m << rMap.city
|
||||
m << rMap.region
|
||||
m << rMap.name
|
||||
if(curPrice){
|
||||
m << curPrice
|
||||
}else{
|
||||
m << 0
|
||||
}
|
||||
m << curDate.toInteger();
|
||||
result << m
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
def createDatas(def city){
|
||||
// def districts = CommonDatautils.findAllDistricts(city, "district", null);
|
||||
// def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
|
||||
// districts.addAll(removeDists)
|
||||
def districts = getFzDistricts(city)
|
||||
def districts = getFzDistricts(city)
|
||||
|
||||
def endDateStr = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-10"
|
||||
def dataStr = DateUtils.add(endDateStr, -30)
|
||||
@@ -115,12 +154,13 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
// def key = row[2] + "##" + row[3] + "##" + row[4]
|
||||
// map2.put(key, row[5])
|
||||
// }
|
||||
|
||||
def lastMonthPriceMap = findFzDistrictStat("福州",lastMonthDate)
|
||||
|
||||
def result = []
|
||||
|
||||
for(def rMap : districts){
|
||||
|
||||
def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, startDate, lastDate)
|
||||
def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, curDate)
|
||||
def curPrice = 0
|
||||
if(dbo){
|
||||
def lastMonthPrice = lastMonthPriceMap.get(rMap.get("_id").toString())
|
||||
@@ -165,6 +205,17 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
return result
|
||||
}
|
||||
|
||||
def findFzDistrictSellStat(city,lastMonthDate){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
q.put("date", lastMonthDate)
|
||||
def priceMap = [:]
|
||||
DISTRICT_SELL_STAT.find(q).each{
|
||||
priceMap.put(it.commid, it)
|
||||
}
|
||||
return priceMap
|
||||
}
|
||||
|
||||
|
||||
def findFzDistrictStat(city,lastMonthDate){
|
||||
def q = new BasicDBObject()
|
||||
@@ -231,7 +282,6 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
udata.put("avg_price", r[5])
|
||||
FZ_DISTRICT_STAT_COLL.update(q, new BasicDBObject('$set', udata))
|
||||
}else{
|
||||
def udata = new BasicDBObject()
|
||||
def o = new BasicDBObject()
|
||||
println r[0]
|
||||
o.put("_id", new ObjectId(r[0]))
|
||||
|
||||
+322
@@ -0,0 +1,322 @@
|
||||
package com.fangjia.script.fuzhou
|
||||
|
||||
import com.fangjia.core.util.DataUtil
|
||||
import com.fangjia.script.BaseBatch
|
||||
import com.fangjia.script.BatchOwner
|
||||
import com.fangjia.script.Watcher
|
||||
import com.fangjia.script.util.CommonUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.DbUtils
|
||||
import com.fangjia.script.util.MongoUtils
|
||||
import com.mongodb.BasicDBObject
|
||||
import com.mongodb.DBCollection
|
||||
import com.mongodb.QueryOperators
|
||||
|
||||
import java.text.DecimalFormat
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.ExecutorService
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.atomic.AtomicLong
|
||||
|
||||
//小区月度均价表(带涨跌幅控制)
|
||||
@BatchOwner(Watcher.GaoJuan)
|
||||
class DistrictSellStatBatch extends BaseBatch {
|
||||
|
||||
static DBCollection FZ_DISTRICT_STAT = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com")
|
||||
|
||||
static DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com")
|
||||
static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com")
|
||||
static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName("business", "fz_district", "mongo.db.fangjia.com")
|
||||
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20)
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
runBatch(new DistrictSellStatBatch(), args);
|
||||
}
|
||||
|
||||
@Override
|
||||
void process(Object args) {
|
||||
calcMonthlyPrice()
|
||||
}
|
||||
|
||||
|
||||
def getMomDate(int date){
|
||||
|
||||
Calendar calendar = Calendar.getInstance()
|
||||
calendar.setTime(Date.parse("yyyyMM", String.valueOf(date)))
|
||||
calendar.add(Calendar.MONTH, -1)
|
||||
return calendar.getTime().format("yyyyMM").toInteger()
|
||||
}
|
||||
|
||||
def getYoyDate(int date){
|
||||
|
||||
Calendar calendar = Calendar.getInstance()
|
||||
calendar.setTime(Date.parse("yyyyMM", String.valueOf(date)))
|
||||
calendar.add(Calendar.YEAR, -1)
|
||||
return calendar.getTime().format("yyyyMM").toInteger()
|
||||
}
|
||||
|
||||
def calcMonthlyPrice(){
|
||||
def citys = CommonUtils.findAllCity()
|
||||
def keys = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("estate_type2", 1)
|
||||
|
||||
def lastMonthWeekend = DateUtils.truncateDay(DateUtils.getLastSundayInWeekOfLastMonth(new Date()))
|
||||
|
||||
def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));
|
||||
def monDate = getMomDate(curMonth)
|
||||
def yoyDate = getYoyDate(curMonth)
|
||||
|
||||
def index = 0
|
||||
for(def city : citys){
|
||||
|
||||
index++
|
||||
def districts = []
|
||||
if(city == "福州"){
|
||||
districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList()
|
||||
}else{
|
||||
districts = DbUtils.seaweed.find(new BasicDBObject("city", city).append("cat", "district").append("visible", 0), keys).batchSize(2000)
|
||||
}
|
||||
|
||||
def weekendPriceMap = findPriceMap(city, lastMonthWeekend)//上个月小区均价
|
||||
def curMonthlyPriceMap = findMonthlyPrice(city, curMonth)//当月小区月均价
|
||||
def lastMonthlyPriceMap = findMonthlyPrice(city, monDate)//上个月小区月均价
|
||||
def lastYearPriceMap = findMonthlyPrice(city, yoyDate)//去年小区月均价
|
||||
if(districts && weekendPriceMap){
|
||||
running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap)
|
||||
}
|
||||
println index+" "+city +" "+ (new Date()).toString()
|
||||
}
|
||||
}
|
||||
|
||||
def running(districts){
|
||||
def totalCount = new AtomicLong()
|
||||
final CountDownLatch latch = new CountDownLatch(districts.size())
|
||||
districts.each{ dist->
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
void run() {
|
||||
try {
|
||||
totalCount.addAndGet(1)
|
||||
println totalCount.get()+" "+ dist.city+" "+dist.name
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
latch.countDown()
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
def running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap){
|
||||
def totalCount = new AtomicLong()
|
||||
final CountDownLatch latch = new CountDownLatch(districts.size())
|
||||
def rets = new CopyOnWriteArrayList()
|
||||
|
||||
districts.each{dist->
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
void run() {
|
||||
try {
|
||||
totalCount.addAndGet(1)
|
||||
def key = dist.region +"##" + dist.name
|
||||
def weekendPriceObj = weekendPriceMap.get(key)
|
||||
if(weekendPriceObj){
|
||||
def curPriceObj = curMonthlyPriceMap.get(key)
|
||||
def lastMonthPriceObj = lastMonthlyPriceMap.get(key)
|
||||
def lastYearPriceObj = lastYearPriceMap.get(key)
|
||||
double mom = 0d
|
||||
|
||||
if(lastMonthPriceObj) {
|
||||
mom = DataUtil.roundDouble(((weekendPriceObj.avg_price - lastMonthPriceObj.avg_price)/(double)lastMonthPriceObj.avg_price),4)
|
||||
}
|
||||
|
||||
def curPrice = null;
|
||||
if(curPriceObj){
|
||||
curPrice = curPriceObj.avg_price
|
||||
}else{
|
||||
curPrice = weekendPriceObj.avg_price
|
||||
}
|
||||
|
||||
if(weekendPriceObj.value_type!=1){
|
||||
if(dist.city == "福州"){
|
||||
if(Math.abs(mom)*100>3){
|
||||
def randMarkup = nextDouble(0, 3)
|
||||
if(mom < 0){
|
||||
mom = DataUtil.roundDouble(randMarkup*(-1)/100, 4)
|
||||
}else{
|
||||
mom = DataUtil.roundDouble(randMarkup/100, 4)
|
||||
}
|
||||
curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price)
|
||||
}
|
||||
}else{
|
||||
if(Math.abs(mom)*100>10){
|
||||
def randMarkup = nextDouble(0, 10)
|
||||
if(mom < 0){
|
||||
mom = DataUtil.roundDouble(randMarkup*(-1)/100,4)
|
||||
}else{
|
||||
mom = DataUtil.roundDouble(randMarkup/100,4)
|
||||
}
|
||||
curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
double yoy = 0d
|
||||
if(lastYearPriceObj){
|
||||
yoy = DataUtil.roundDouble(((curPrice - lastYearPriceObj.avg_price)/(double)lastYearPriceObj.avg_price),4)
|
||||
}
|
||||
if(curPriceObj){
|
||||
if(curPrice!=weekendPriceObj.avg_price){
|
||||
def data = new BasicDBObject()
|
||||
data.put("m_date", new Date())
|
||||
data.put("commid", dist._id.toString())
|
||||
data.put("mom", mom)
|
||||
data.put("yoy", yoy)
|
||||
data.put("avg_price", curPrice)
|
||||
DISTRICT_SELL_STAT.update(new BasicDBObject("_id", curPriceObj._id) , new BasicDBObject('$set', data),true,false)
|
||||
println "[update]"+totalCount.get()+" "+ dist.city+" "+dist.name
|
||||
}
|
||||
}else{
|
||||
def data = new BasicDBObject()
|
||||
data.put("city", dist.city)
|
||||
data.put("region", dist.region)
|
||||
data.put("district_name", dist.name)
|
||||
data.put("estate_type", dist.estate_type2)
|
||||
data.put("date", curMonth)
|
||||
data.put("avg_price", curPrice)
|
||||
data.put("credit", weekendPriceObj.credit)
|
||||
data.put("m_date", new Date())
|
||||
data.put("commid", dist._id.toString())
|
||||
data.put("mom", mom)
|
||||
data.put("yoy", yoy)
|
||||
DISTRICT_SELL_STAT.save(data)
|
||||
println "[save]"+totalCount.get()+" "+ dist.city+" "+dist.name
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
latch.countDown()
|
||||
}
|
||||
};
|
||||
})
|
||||
}
|
||||
latch.await()
|
||||
}
|
||||
|
||||
|
||||
//随机浮点数
|
||||
public static double nextDouble(final double min, final double max) throws Exception {
|
||||
|
||||
DecimalFormat df = new DecimalFormat("#.00");
|
||||
if (max < min) {
|
||||
throw new Exception("min < max");
|
||||
}
|
||||
if (min == max) {
|
||||
return min;
|
||||
}
|
||||
return Double.parseDouble(df.format(min + ((max - min) * new Random().nextDouble())));
|
||||
}
|
||||
|
||||
|
||||
def findPriceMap(city, weekend){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
q.put("weekend", weekend)
|
||||
def dbcursor = DISTRICT_STAT.find(q)
|
||||
def priceMap = [:]
|
||||
for(def d : dbcursor){
|
||||
priceMap.put(d.region +"##"+d.district_name, d)
|
||||
}
|
||||
return priceMap
|
||||
}
|
||||
|
||||
def findMonthlyPrice(city, monDate){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city", city)
|
||||
q.put("date", monDate)
|
||||
def dbcursor = DISTRICT_SELL_STAT.find(q)
|
||||
def priceMap = [:]
|
||||
for(def d : dbcursor){
|
||||
priceMap.put(d.region +"##"+d.district_name, d)
|
||||
}
|
||||
return priceMap
|
||||
}
|
||||
|
||||
|
||||
|
||||
// def updateDistrictSellStat(citys){
|
||||
// def index = 0
|
||||
// citys.each{city->
|
||||
// index ++
|
||||
// def stats = FZ_DISTRICT_STAT.find(new BasicDBObject("month",202209).append("city", city).append("avg_price", new BasicDBObject(QueryOperators.GTE, 0))).asList()
|
||||
// if(stats){
|
||||
// batchUpdate(stats)
|
||||
// }
|
||||
// println "[${index}] "+city+" 完成"
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// def batchUpdate(def stats){
|
||||
// def totalCount = new AtomicLong()
|
||||
// final CountDownLatch latch = new CountDownLatch(stats.size())
|
||||
//
|
||||
// for(def i=0;i<stats.size();i++){
|
||||
// final def stat = stats[i]
|
||||
// fixedThreadPool.execute(new Runnable() {
|
||||
// void run() {
|
||||
// try {
|
||||
// totalCount.addAndGet(1)
|
||||
// updateHistory(stat)
|
||||
//// println totalCount.get() +" "+stat.city+" "+stat.name
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace()
|
||||
// } finally {
|
||||
// latch.countDown()
|
||||
// }
|
||||
// };
|
||||
// })
|
||||
// }
|
||||
// latch.await()
|
||||
// }
|
||||
//
|
||||
// def updateHistory(stat){
|
||||
// def obj = findDistrictSellStatByDate(stat.city, stat.region, stat.name, stat.month)
|
||||
// if(obj){
|
||||
// if(obj.avg_price!=stat.avg_price){
|
||||
// def monDate = getMomDate(stat.month)
|
||||
// def yoyDate = getYoyDate(stat.month)
|
||||
//
|
||||
// def monDbo = findDistrictSellStatByDate(stat.city, stat.region, stat.name, monDate)
|
||||
// def yoyDbo = findDistrictSellStatByDate(stat.city, stat.region, stat.name, yoyDate)
|
||||
// double mom = 0d
|
||||
// if(monDbo && monDbo.avg_price != 0) {
|
||||
// mom = DataUtil.roundDouble(((stat.avg_price - monDbo.avg_price)/(double)monDbo.avg_price),4)
|
||||
// }
|
||||
// double yoy = 0d
|
||||
// if(yoyDbo != null && yoyDbo.avg_price != 0){
|
||||
// yoy = DataUtil.roundDouble(((stat.avg_price - yoyDbo.avg_price)/(double)yoyDbo.avg_price),4)
|
||||
// }
|
||||
//
|
||||
// def udata = new BasicDBObject();
|
||||
// udata.put("avg_price", stat.avg_price)
|
||||
// udata.put("mom", mom)
|
||||
// udata.put("yoy", yoy)
|
||||
// udata.put("m_date", new Date())
|
||||
// DISTRICT_SELL_STAT.update(new BasicDBObject("_id", obj._id) , new BasicDBObject('$set', udata),true,false)
|
||||
// }
|
||||
// }else{
|
||||
// println stat.city+" "+stat.region+" "+stat.name+" 不存在"
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// def findDistrictSellStatByDate(city, region, name, month){
|
||||
// def q = new BasicDBObject("city", city).append("region", region).append("district_name", name).append("date", month)
|
||||
// def obj = DISTRICT_SELL_STAT.findOne(q)
|
||||
// return obj;
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
+3
-3
@@ -24,7 +24,7 @@ class FzDataResultStat {
|
||||
|
||||
static main(args) {
|
||||
def task = new FzDataResultStat()
|
||||
// task.priceMarkupRun();
|
||||
task.priceMarkupRun();
|
||||
task.regionPriceTrendRun()
|
||||
//// task.margeExcel()
|
||||
// task.saveCsvData()
|
||||
@@ -111,8 +111,8 @@ class FzDataResultStat {
|
||||
def regions = ["뮬짜","꾑�","憩쉭","쐈갛","쯩棺","낀있"];
|
||||
def datas1 = []
|
||||
def datas2 = []
|
||||
datas1 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅"]
|
||||
datas2 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅"]
|
||||
datas1 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅", "是否有效"]
|
||||
datas2 << ["城市","区域","名称","${curMonth}价格","${lastMonth}价格", "涨跌幅", "是否有效"]
|
||||
def row_num = 0
|
||||
for(def row : rows){
|
||||
if(row_num>0){
|
||||
|
||||
@@ -5,9 +5,36 @@ import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.EsUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
import com.fangjia.script.util.MongoUtils
|
||||
import com.mongodb.BasicDBObject
|
||||
import com.mongodb.DBCollection
|
||||
import org.apache.commons.io.FileUtils
|
||||
import org.bson.types.ObjectId
|
||||
|
||||
|
||||
DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com")
|
||||
|
||||
def datas = FileUtils.readLines("D:\\数据\\其它\\FJW_COMM_20221015.csv")
|
||||
def rets = []
|
||||
for(def d : datas){
|
||||
def arrs = d.split("@")
|
||||
rets << ["commId":arrs[0], "avg_price":arrs[4]]
|
||||
}
|
||||
|
||||
for(def r : rets){
|
||||
if(r.avg_price){
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("date", 202210)
|
||||
udata.put("avg", r.avg_price.toInteger())
|
||||
DISTRICT_SELL_STAT.update(new BasicDBObject("commid", r.commId) , new BasicDBObject('$set', data),false,false)
|
||||
}else{
|
||||
println r.commId +" 不存在"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//List<String> list = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\FJW_HOUSE_201911.csv"))
|
||||
//println "过滤前:"+list.size()+ " "+new Date().toLocaleString()
|
||||
//def ret = []
|
||||
@@ -48,29 +75,29 @@ import org.bson.types.ObjectId
|
||||
// return location;
|
||||
//}
|
||||
|
||||
List<String> list1= FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202112.csv"))
|
||||
def map1 = [:]
|
||||
for(def s : list1){
|
||||
def row = s.split("@\\|@")
|
||||
def key = row[2]+"##"+row[3]+"##"+row[4]
|
||||
map1.put(key, row[5])
|
||||
}
|
||||
|
||||
List<String> list2 = FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202111.csv"))
|
||||
def map2 = [:]
|
||||
for(def s : list2) {
|
||||
def row = s.split("@\\|@")
|
||||
def key = row[2] + "##" + row[3] + "##" + row[4]
|
||||
map2.put(key, row[5])
|
||||
}
|
||||
def rows = []
|
||||
map1.each {k,v->
|
||||
def row = []
|
||||
def keys = k.split("##")
|
||||
def lastPrice = map2.get(k)
|
||||
rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()]
|
||||
}
|
||||
ExcelUtils.write("D:\\数据\\福州\\价格比对12-2.xlsx", rows, "数据")
|
||||
//List<String> list1= FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202112.csv"))
|
||||
//def map1 = [:]
|
||||
//for(def s : list1){
|
||||
// def row = s.split("@\\|@")
|
||||
// def key = row[2]+"##"+row[3]+"##"+row[4]
|
||||
// map1.put(key, row[5])
|
||||
//}
|
||||
//
|
||||
//List<String> list2 = FileUtils.readLines(new File("D:\\数据\\福州\\FJW_DISTRICT_STAT_202111.csv"))
|
||||
//def map2 = [:]
|
||||
//for(def s : list2) {
|
||||
// def row = s.split("@\\|@")
|
||||
// def key = row[2] + "##" + row[3] + "##" + row[4]
|
||||
// map2.put(key, row[5])
|
||||
//}
|
||||
//def rows = []
|
||||
//map1.each {k,v->
|
||||
// def row = []
|
||||
// def keys = k.split("##")
|
||||
// def lastPrice = map2.get(k)
|
||||
// rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()]
|
||||
//}
|
||||
//ExcelUtils.write("D:\\数据\\福州\\价格比对12-2.xlsx", rows, "数据")
|
||||
//ExcelUtils.multiThreadingModify("D:\\数据\\福州\\福州涨幅在10%以上小区.xlsx",{d->
|
||||
// def obj = CommonDatautils.queryDistrictPrice(d['A'],d['B'], d['C'], DateUtils.parseFromTightByPattern("2021-10-10","yyyy-MM-dd"))
|
||||
// if(obj){
|
||||
|
||||
@@ -14,7 +14,7 @@ import com.mongodb.DBCollection
|
||||
//福州第三方均价统计,发送钉钉消息
|
||||
//def datas = ExcelUtils.read("d:\\数据\\福州\\福州4月2.xlsx",0,1)
|
||||
//def datas = CsvUtils.read("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv");
|
||||
def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202209.csv")
|
||||
def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202211.csv")
|
||||
def count0 = 0
|
||||
def count1 = 0
|
||||
def count2 = 0
|
||||
|
||||
File diff suppressed because one or more lines are too long
+3
-3
@@ -48,13 +48,13 @@ class YouDaDataParser {
|
||||
def final AtomicInteger count_ = new AtomicInteger(0)
|
||||
|
||||
|
||||
static def statDate = "2022-09-01"
|
||||
static def statDate = "2022-10-01"
|
||||
static main(args) {
|
||||
def task = new YouDaDataParser();
|
||||
// task.newHouseparse();//友达一手房存入mongo
|
||||
// task.esfParser("D:\\数据\\友达\\2022年10月\\查询1.DBF");//友达二手房存入mongo
|
||||
// task.esfParser("D:\\数据\\友达\\2022年12月\\查询1.DBF");//友达二手房存入mongo
|
||||
// task.newhouseToSaveEs();//新房保存到es
|
||||
// task.esfhouseToSaveEs();//二手房保存到es
|
||||
task.esfhouseToSaveEs();//二手房保存到es
|
||||
// task.updateFinishDateByEsfTrade();//根据二手成交的竣工时间修改seaweed库中的竣工时间
|
||||
}
|
||||
|
||||
|
||||
@@ -221,6 +221,15 @@ class CcbCodeUtils {
|
||||
}
|
||||
return "99"
|
||||
}
|
||||
|
||||
static def getUseTypeCode(def estateType){
|
||||
if(estateType=="ÉÌס"){
|
||||
return "13"
|
||||
}else if(estateType && (estateType=="ÆÕͨסլ")){
|
||||
return "11"
|
||||
}
|
||||
return "11"
|
||||
}
|
||||
//室内结构
|
||||
//平层:11 错层:12 复式:13 阁楼:14 团结户:15 老式房:16 地下室:17 带阁楼:21 带车库:22 其他:99 跃层:18 带地下室:24 带储藏室:25 带车位:23
|
||||
static def getHouseStructureCode(){
|
||||
|
||||
+24
-1
@@ -29,7 +29,30 @@ class DataMatch {
|
||||
// task.run3()
|
||||
// println task.findAddress("²ıÖݽֵÀÌÄÏã·")
|
||||
|
||||
task.run2MatchV2( "D:\\数据\\重庆农商行\\估值1-V2.xlsx")
|
||||
// task.run2MatchV2( "D:\\数据\\重庆农商行\\估值1-V2.xlsx")
|
||||
task.fzWeiyuanshuMatch("D:\\数据\\福州\\连江楼盘.xlsx")
|
||||
}
|
||||
|
||||
def fzWeiyuanshuMatch(fileName){
|
||||
ExcelUtils.multiThreadingModify(fileName,{d->
|
||||
// if(!d['G']){
|
||||
// def arr = OpenApiClient.search("福州", "连江", d['C'])
|
||||
// if(arr){
|
||||
// d['E'] = arr.city
|
||||
// d['F'] = arr.district
|
||||
// d['G'] = arr.name
|
||||
// }
|
||||
// }
|
||||
|
||||
def results = null
|
||||
if(d['H'] && d['H']=="F" && d['C']){
|
||||
results = OpenApiClient.addressMatch("福州",d['C'], "property", false, "连江", null)
|
||||
}
|
||||
if(results && results.precise>=0){
|
||||
d['J'] = results.district
|
||||
d['K'] = results.name
|
||||
}
|
||||
},0)
|
||||
}
|
||||
|
||||
def run1(){
|
||||
|
||||
+162
-43
@@ -2,51 +2,172 @@ package com.fangjia.script.gj.crawl
|
||||
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.temp.shenjian.util.SeaweedUtils
|
||||
import com.fangjia.script.util.DbUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
import com.fangjia.script.util.OpenApiClient
|
||||
import com.mongodb.BasicDBObject
|
||||
import org.bson.types.ObjectId
|
||||
|
||||
class AnjukeDistrictMatch {
|
||||
|
||||
static main(args) {
|
||||
def task = new AnjukeDistrictMatch();
|
||||
task.run();
|
||||
// task.run();
|
||||
// task.run1()
|
||||
// task.updateField()
|
||||
task.fenQiRun()
|
||||
}
|
||||
|
||||
def run1(){
|
||||
def regionPointsMap = findRegionRange("重庆")
|
||||
def flag = isInArea(dist.lng/10000000000.0, dist.lat/10000000000.0, regionPointsMap.get(dist.region))
|
||||
def fenQiRun(){
|
||||
def citys = ['苏州','杭州','宁波','温州','嘉兴','湖州','绍兴','金华','衢州','舟山','台州','丽水']
|
||||
for(def c : citys){
|
||||
def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region","name","virescence_percent","build_area","all_area","cubage_percent","master_district_name"])
|
||||
def distMap = findFiqiDatas(dists)
|
||||
println c +" "+dists.size() +" "+ distMap.size()
|
||||
addFieldValue(distMap);
|
||||
}
|
||||
}
|
||||
|
||||
def addFieldValue(distMap){
|
||||
def index = 0
|
||||
distMap.each {k,v->
|
||||
if(v.master_district_name!="master"){
|
||||
def masterKey = v.city +"##"+v.region+"##"+v.master_district_name;
|
||||
// def masterObj = distMap.get(masterKey)
|
||||
def masterObj = CommonDatautils.findDistrict(v.city, v.region, v.master_district_name, "district");
|
||||
if(masterObj){
|
||||
def udata = new BasicDBObject()
|
||||
if(!v.virescence_percent && masterObj.virescence_percent){
|
||||
udata.put("virescence_percent", masterObj.virescence_percent)
|
||||
}
|
||||
|
||||
if(!v.build_area && masterObj.build_area){
|
||||
udata.put("build_area", masterObj.build_area)
|
||||
}
|
||||
|
||||
if(!v.all_area && masterObj.all_area){
|
||||
udata.put("all_area", masterObj.all_area)
|
||||
}
|
||||
|
||||
if(!v.cubage_percent && masterObj.cubage_percent){
|
||||
udata.put("cubage_percent", masterObj.cubage_percent)
|
||||
}
|
||||
|
||||
if(udata){
|
||||
index ++
|
||||
udata.put("m_date",new Date())
|
||||
def q = new BasicDBObject()
|
||||
q.put("_id", new ObjectId(v._id.toString()))
|
||||
DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
println index;
|
||||
}
|
||||
|
||||
def findFiqiDatas(dists){
|
||||
def distMap = [:]
|
||||
for(def d : dists){
|
||||
def master_district_name = d.master_district_name
|
||||
if(master_district_name && master_district_name!="null"){
|
||||
distMap.put(d.city+"##"+d.region+"##"+d.name, d);
|
||||
}
|
||||
}
|
||||
return distMap;
|
||||
}
|
||||
|
||||
|
||||
def updateField(){
|
||||
def filePath = "D:\\数据\\建行\\二期\\第三方小区字段补充\\绿化率.xlsx"
|
||||
ExcelUtils.multiThreadingModify(filePath, { row ->
|
||||
if(row['Q'] && !row['Q'].contains("接口")){
|
||||
def dist = CommonDatautils.findSeaweedById(row['R'], ["virescence_percent"])
|
||||
if(dist && !dist.virescence_percent){
|
||||
def val = row['K']
|
||||
if(!val){
|
||||
val = row['J']
|
||||
}
|
||||
if(!val){
|
||||
val = row['M']
|
||||
}
|
||||
if(!val){
|
||||
val = row['O']
|
||||
}
|
||||
if(!val){
|
||||
val = row['G']
|
||||
}
|
||||
if(!val){
|
||||
val = row['E']
|
||||
}
|
||||
if(!val){
|
||||
val = row['F']
|
||||
}
|
||||
if(!val){
|
||||
val = row['H']
|
||||
}
|
||||
if(!val){
|
||||
val = row['I']
|
||||
}
|
||||
if(!val){
|
||||
val = row['L']
|
||||
}
|
||||
if(!val){
|
||||
val = row['N']
|
||||
}
|
||||
if(!val){
|
||||
val = row['O']
|
||||
}
|
||||
|
||||
if(val){
|
||||
if(val.toString().toDouble().toInteger()==val.toString().toDouble()){
|
||||
val = val.toString().toDouble().toInteger()
|
||||
}
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("virescence_percent", val.toString())
|
||||
udata.put("m_date",new Date())
|
||||
|
||||
def q = new BasicDBObject()
|
||||
q.put("_id", new ObjectId(dist._id.toString()))
|
||||
DbUtils.seaweed.update(q, new BasicDBObject('$set', udata))
|
||||
row['U'] = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// def run1(){
|
||||
// def regionPointsMap = findRegionRange("重庆")
|
||||
// def flag = isInArea(dist.lng/10000000000.0, dist.lat/10000000000.0, regionPointsMap.get(dist.region))
|
||||
// }
|
||||
def run(){
|
||||
|
||||
|
||||
|
||||
def filePath = "D:\\数据\\重庆农商行\\安居客\\重庆小区.xlsx"
|
||||
def filePath = "D:\\数据\\建行\\二期\\第三方小区字段补充\\绿化率.xlsx"
|
||||
ExcelUtils.multiThreadingModify(filePath,{row->
|
||||
if(row['A'] && !row['J']){
|
||||
if(row['A'] && !row['Q']){
|
||||
def city = row['B']
|
||||
def region = row['C']
|
||||
def name = row['D']
|
||||
def address = row['E']
|
||||
// def flag = "别名匹配"
|
||||
|
||||
|
||||
// def dist = matchDist(city, null, name)
|
||||
// if(!row['J'] && name.contains("(")){
|
||||
// name = name.replace("(${region})","").replace("(","").replace(")","")
|
||||
// flag = "去括号匹配"
|
||||
// dist = matchDist(city, region, name)
|
||||
// }
|
||||
// if(!dist){
|
||||
// dist = CommonDatautils.findSeaweedByMappingAlias(city, region, name,"district")
|
||||
// flag = "映射别名匹配"
|
||||
// }
|
||||
// if(!dist) {
|
||||
// def rets = CommonDatautils.findDistrictByAlias(city, region, name, "district")
|
||||
// if(rets && rets.size()==1){
|
||||
// dist = rets[0]
|
||||
// }
|
||||
// }
|
||||
def flag = "名称匹配"
|
||||
def dist = matchDist(city, region, name)
|
||||
if(!row['D'] && name.contains("(")){
|
||||
name = name.replace("(${region})","").replace("(","").replace(")","")
|
||||
flag = "去括号匹配"
|
||||
dist = matchDist(city, region, name)
|
||||
}
|
||||
if(!dist){
|
||||
dist = CommonDatautils.findSeaweedByMappingAlias(city, region, name,"district")
|
||||
flag = "映射别名匹配"
|
||||
}
|
||||
if(!dist) {
|
||||
def rets = CommonDatautils.findDistrictByAlias(city, region, name, "district")
|
||||
if(rets && rets.size()==1){
|
||||
dist = rets[0]
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// if(!dist){
|
||||
@@ -61,23 +182,21 @@ class AnjukeDistrictMatch {
|
||||
// }
|
||||
// }
|
||||
|
||||
// if(dist){
|
||||
// row['J'] = flag
|
||||
// row['K'] = dist._id.toString()
|
||||
// row['L'] = dist.region
|
||||
// row['M'] = dist.name
|
||||
// row['N'] = dist.address
|
||||
// }
|
||||
|
||||
def jsonObject = OpenApiClient.addressMatch(city, address, "property", false,region,name)
|
||||
if(jsonObject != null && jsonObject.precise!=-1) {
|
||||
// row['J'] = "匹配接口"
|
||||
// row['K'] = jsonObject.get("id")
|
||||
// row['L'] = jsonObject.get("district")
|
||||
// row['M'] = jsonObject.get("name")
|
||||
// row['N'] = jsonObject.get("address")
|
||||
row['M'] = jsonObject.get("name")
|
||||
if(dist){
|
||||
row['Q'] = flag
|
||||
row['R'] = dist._id.toString()
|
||||
row['S'] = dist.region
|
||||
row['T'] = dist.name
|
||||
}else{
|
||||
def jsonObject = OpenApiClient.addressMatch(city, name, "property", false,region, null)
|
||||
if(jsonObject != null && jsonObject.precise!=-1) {
|
||||
row['Q'] = "匹配接口"
|
||||
row['R'] = jsonObject.get("id")
|
||||
row['S'] = jsonObject.get("district")
|
||||
row['T'] = jsonObject.get("name")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
+22
@@ -67,6 +67,7 @@ class FangjiaClientUtils {
|
||||
|
||||
|
||||
|
||||
//分词 省,市,区
|
||||
public static def addressStand(def city, def address){
|
||||
def jsonObj = null
|
||||
def content = null
|
||||
@@ -84,6 +85,27 @@ class FangjiaClientUtils {
|
||||
return jsonObj;
|
||||
}
|
||||
|
||||
//分词基础上的标准化,complete=false 不不全 short=true 省市区返回简拼
|
||||
public static def addressStructure(def city, def address){
|
||||
def jsonObj = null
|
||||
def content = null
|
||||
try {
|
||||
if(address){
|
||||
address = address.replace("{","")
|
||||
def url = "http://192.168.0.19:31080/FangJiaAddressService/structure/v2?address="+URLEncoder.encode(address,"UTF-8")
|
||||
if(city){
|
||||
url = url +"&city="+URLEncoder.encode(city,"UTF-8")
|
||||
}
|
||||
content = new HttpRequest().newGet(url, null, "utf-8")
|
||||
jsonObj = JSONObject.fromObject(content)
|
||||
}
|
||||
} catch (Exception e) {
|
||||
println address +" "+content
|
||||
e.printStackTrace();
|
||||
}
|
||||
return jsonObj;
|
||||
}
|
||||
|
||||
public static def arroundPrice(city,address){
|
||||
def jsonObj = null
|
||||
def content = null
|
||||
|
||||
+2
-2
@@ -19,11 +19,11 @@ class EsMonthHouseStat {
|
||||
def task = new EsMonthHouseStat()
|
||||
// task.run()
|
||||
// task.tradeRun()
|
||||
// task.houseRun()
|
||||
task.houseRun()
|
||||
|
||||
// task.statHouseUpdateCount()
|
||||
|
||||
task.statDistHouse()
|
||||
// task.statDistHouse()
|
||||
}
|
||||
|
||||
def statDistHouse(){
|
||||
|
||||
+4
-4
@@ -38,13 +38,13 @@ public class BeiKeCrawlByChrome {
|
||||
def task = new BeiKeCrawlByChrome();
|
||||
task.run()
|
||||
// task.run1()
|
||||
task.addDealRegion();
|
||||
// task.addDealRegion();
|
||||
}
|
||||
|
||||
|
||||
|
||||
def run(){
|
||||
System.setProperty("webdriver.chrome.driver", "D:\\Program Files\\chrome-driver\\chromedriver.exe");
|
||||
System.setProperty("webdriver.chrome.driver", "C:\\Program Files\\Google\\Chrome\\Application\\chromedriver.exe");
|
||||
System.setProperty("http.nonProxyHosts", "localhost");
|
||||
|
||||
WebDriver driver = new ChromeDriver()
|
||||
@@ -240,7 +240,7 @@ public class BeiKeCrawlByChrome {
|
||||
|
||||
def price = e.select(".totalPrice .number").text()
|
||||
if (price && price.isNumber()) {
|
||||
detail.total_price = price.toInteger() * 10000
|
||||
detail.total_price = (int)(price.toDouble() * 10000)
|
||||
}
|
||||
|
||||
if (detail.total_price && detail.area) {
|
||||
@@ -398,7 +398,7 @@ public class BeiKeCrawlByChrome {
|
||||
if(cityEles){
|
||||
for(def e : cityEles){
|
||||
def href = e.attr("href")
|
||||
// if(e.text().contains("ºÏ·Ê")){
|
||||
// if(e.text().contains("¸£ÖÝ")){
|
||||
def cityMap = [:]
|
||||
cityMap.city = e.text()
|
||||
cityMap.url = "https:"+href
|
||||
|
||||
+3
-3
@@ -38,7 +38,7 @@ public class LianjiaCrawlByChrome {
|
||||
task.run()
|
||||
// task.run1()
|
||||
// task.addDealRegion();
|
||||
task.standardRegion()
|
||||
// task.standardRegion()
|
||||
// task.updadteDealPriceField()
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ public class LianjiaCrawlByChrome {
|
||||
}
|
||||
|
||||
def run(){
|
||||
System.setProperty("webdriver.chrome.driver", "D:\\Program Files\\chrome-driver\\chromedriver.exe");
|
||||
System.setProperty("webdriver.chrome.driver", "C:\\Program Files\\Google\\Chrome\\Application\\chromedriver.exe");
|
||||
System.setProperty("http.nonProxyHosts", "localhost");
|
||||
WebDriver driver = new ChromeDriver()
|
||||
def cityMap = getAllCityUrls(driver)
|
||||
@@ -316,7 +316,7 @@ public class LianjiaCrawlByChrome {
|
||||
|
||||
def price = e.select(".totalPrice .number").text()
|
||||
if (price && price.isNumber()) {
|
||||
detail.total_price = price.toInteger() * 10000
|
||||
detail.total_price = (int)(price.toDouble() * 10000)
|
||||
}
|
||||
|
||||
if (detail.total_price && detail.area) {
|
||||
|
||||
+5
-5
@@ -38,8 +38,8 @@ class PaimaiDataSend {
|
||||
// task.jdRunByMongo()
|
||||
|
||||
// task.aliZcRun()
|
||||
task.aliZcRun2()
|
||||
// task.aliFpRun()
|
||||
// task.aliZcRun2()
|
||||
task.aliFpRun()
|
||||
// task.rmfysszcRun()
|
||||
// task.jdRun()
|
||||
// task.checkUrl()
|
||||
@@ -334,10 +334,10 @@ class PaimaiDataSend {
|
||||
def index = 0
|
||||
def q = new BasicDBObject()
|
||||
// q.put("city",new BasicDBObject('$in', ["ÄϾ©","ËÞǨ","ËÕÖÝ"]))
|
||||
q.put("province","蔬劼")
|
||||
q.put("sub_type","芩華")
|
||||
// q.put("province","蔬劼")
|
||||
// q.put("sub_type","芩華")
|
||||
// q.put("parser_status", new BasicDBObject('$ne',2))
|
||||
q.put("url","https://susong-item.taobao.com/auction/671320162557.htm")
|
||||
q.put("url","https://sf-item.taobao.com/sf_item/673646300374.htm")
|
||||
//https://sf-item.taobao.com/sf_item/657131607486.htm
|
||||
// q.put("parser_status", new BasicDBObject('$exists',false))
|
||||
// q.put("finishDate", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD("2022-09-01")))
|
||||
|
||||
+174
@@ -0,0 +1,174 @@
|
||||
package com.fangjia.script.gj.test
|
||||
|
||||
import com.fangjia.core.util.DataUtil
|
||||
import com.fangjia.script.gj.ccb.FileUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.ElasticUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
import com.fangjia.script.util.OpenApiClient
|
||||
import net.sf.json.JSONObject
|
||||
import org.elasticsearch.index.query.QueryBuilder
|
||||
import org.elasticsearch.index.query.QueryBuilders
|
||||
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.ExecutorService
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.atomic.AtomicLong
|
||||
|
||||
class DongGuangApiTest {
|
||||
|
||||
public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30)
|
||||
|
||||
static main(args) {
|
||||
def task = new DongGuangApiTest()
|
||||
task.run()
|
||||
}
|
||||
|
||||
def run(){
|
||||
// def rets = findEsData();
|
||||
def rets = readTxt("D:\\数据\\东莞银行\\东莞银行 (1).csv")
|
||||
println "ES 加载完成"
|
||||
def datas = evaluation(rets)
|
||||
println "重估完成"
|
||||
// ExcelUtils.write("D:\\数据\\东莞银行\\东莞重估.xlsx", datas, "数据")
|
||||
FileUtils.batchCreateFile(datas, "D:\\数据\\东莞银行\\东莞重估.txt", [], "utf-8", true);
|
||||
println "txt 生成"
|
||||
exportCsv("D:\\数据\\东莞银行\\东莞重估.csv", datas)
|
||||
println "csv 生成"
|
||||
}
|
||||
|
||||
def readTxt(def fileName){
|
||||
File file = new File(fileName);
|
||||
def rows = [];
|
||||
|
||||
file.eachLine{
|
||||
def row = it.split("#",-1)
|
||||
if(row && row.size()>=2){
|
||||
def s = row[1]
|
||||
JSONObject result = JSONObject.fromObject(s);
|
||||
rows << result
|
||||
}
|
||||
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
def evaluation(rets){
|
||||
def datas = new CopyOnWriteArrayList()
|
||||
def totalCount = new AtomicLong()
|
||||
final CountDownLatch latch = new CountDownLatch(rets.size())
|
||||
for(def i=0;i<rets.size();i++){
|
||||
final def dist = rets[i]
|
||||
fixedThreadPool.execute(new Runnable() {
|
||||
void run() {
|
||||
try{
|
||||
totalCount.addAndGet(1)
|
||||
def ret = OpenApiClient.addressEvaluation(dist.city, dist.district, dist.name, 100)
|
||||
if(ret && ret.avgPrice){
|
||||
def row = []
|
||||
row << dist.city
|
||||
row << dist.district
|
||||
row << dist.name
|
||||
row << dist.size
|
||||
row << ret.city
|
||||
row << ret.district
|
||||
row << ret.name
|
||||
row << ret.avgPrice
|
||||
datas << row
|
||||
}else{
|
||||
def row = []
|
||||
row << dist.city
|
||||
row << dist.district
|
||||
row << dist.name
|
||||
row << dist.size
|
||||
datas << row
|
||||
}
|
||||
println totalCount.get() +"/"+rets.size()
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
} finally {
|
||||
latch.countDown()
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
latch.await()
|
||||
return datas;
|
||||
}
|
||||
|
||||
|
||||
|
||||
def findEsData(){
|
||||
def time = DateUtils.parseFromTightYYYYMMDD("2022-01-01")
|
||||
QueryBuilder date_range_cdate = QueryBuilders.rangeQuery("c_date").from(time.getTime())
|
||||
QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("user_id", '1007713'))
|
||||
.must(QueryBuilders.termQuery("request_uri", '/property/evaluate'))
|
||||
.must(date_range_cdate)
|
||||
def rets = new CopyOnWriteArrayList()
|
||||
// def datas = ElasticUtils.executeSimpleQuery("192.168.0.206", "open_uri_log", queryBuilder);
|
||||
// if(datas){
|
||||
// for (int k=0;k<datas.size();k++) {
|
||||
// def map = datas[k];
|
||||
// def paramMap = map.parameter_map
|
||||
// rets << paramMap
|
||||
// }
|
||||
// }
|
||||
|
||||
ElasticUtils.executeQuery("192.168.0.206", "open_uri_log", queryBuilder, { Map map ->
|
||||
def paramMap = map.parameter_map
|
||||
rets << paramMap
|
||||
if(rets.size()%10000==0){
|
||||
println "."+ new Date()
|
||||
}
|
||||
})
|
||||
return rets;
|
||||
}
|
||||
|
||||
|
||||
def exportCsv(path, list){
|
||||
File file = new File(path);
|
||||
if (file.exists()){
|
||||
file.delete();
|
||||
}
|
||||
file.append("用户输入城市,")
|
||||
file.append("用户输入城市区域,")
|
||||
file.append("用户输入城市地址,")
|
||||
file.append("用户输入城市面积,")
|
||||
file.append(System.getProperty("line.separator"));
|
||||
list.each{
|
||||
def d = it;
|
||||
file.append(d[0] + ",","gbk")
|
||||
file.append(d[1] + ",","gbk")
|
||||
file.append(d[2] + ",","gbk")
|
||||
file.append(d[3] + ",","gbk")
|
||||
if(d[4]){
|
||||
file.append(d[4]+",","gbk")
|
||||
}else{
|
||||
file.append(",")
|
||||
|
||||
}
|
||||
|
||||
if(d[5]){
|
||||
file.append(d[5] +",","gbk")
|
||||
}else{
|
||||
file.append(",")
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(d[6]){
|
||||
file.append(d[6] +",","gbk")
|
||||
}else{
|
||||
file.append(",")
|
||||
|
||||
}
|
||||
if(d[7]){
|
||||
file.append(d[7]+",","gbk")
|
||||
}else{
|
||||
file.append(",")
|
||||
}
|
||||
file.append(System.getProperty("line.separator"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,12 +3,15 @@ package com.fangjia.script.gj.test
|
||||
import ch.qos.logback.core.db.dialect.DBUtil
|
||||
import com.fangjia.core.RegionData
|
||||
import com.fangjia.script.commData.CommonDatautils
|
||||
import com.fangjia.script.gj.district.FangjiaClientUtils
|
||||
import com.fangjia.script.gj.district.SeaweedDataMatchProcess
|
||||
import com.fangjia.script.lixue.util.DBUtils
|
||||
import com.fangjia.script.util.CommonUtils
|
||||
import com.fangjia.script.util.DateUtils
|
||||
import com.fangjia.script.util.DbUtils
|
||||
import com.fangjia.script.util.ExcelUtils
|
||||
import com.fangjia.script.util.MongoUtils
|
||||
import com.fangjia.script.util.OpenApiClient
|
||||
import com.mongodb.BasicDBObject
|
||||
import com.mongodb.DBCollection
|
||||
import com.mongodb.Mongo
|
||||
@@ -24,6 +27,75 @@ DBCollection coll = MongoUtils.getCollectionByName("seeds_db", "city_seeds", "1
|
||||
def ZS_MONGODB_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009";
|
||||
DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "township", ZS_MONGODB_URL)
|
||||
|
||||
|
||||
DBCollection FANGJIA_AREA_CODE = MongoUtils.getCollectionByName("business", "fangjia_area_code", "mongo.db.fangjia.com")
|
||||
DBCollection GUIDING_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "guiding_price", "mongo.db.fangjia.com")
|
||||
//ExcelUtils.modify("D:\\数据\\证券\\国君见证失败原因.xls", { d ->
|
||||
//})
|
||||
|
||||
|
||||
ExcelUtils.modify("D:\\数据\\证券\\国君见证失败原因(标准化省市区).xls", { d ->
|
||||
def info = d['A']
|
||||
if(info && !d['E']){
|
||||
def arrs = info.split("!~")
|
||||
if(arrs && arrs[2] && arrs[3]){
|
||||
// def rMap = SeaweedDataMatchProcess.doMatch(d['B'], d['C'], arrs[4], arrs[4]);
|
||||
// if(rMap) {
|
||||
// d['E'] = rMap.name
|
||||
// d['F'] = rMap.id
|
||||
// }
|
||||
|
||||
def address = null
|
||||
if(d['G']){
|
||||
address = d['G']
|
||||
}else{
|
||||
address = arrs[4]
|
||||
}
|
||||
|
||||
def jsonObject = OpenApiClient.addressMatch(d['C'], address, "property", false, d['D'], null)
|
||||
if(jsonObject != null && jsonObject.precise!=-1) {
|
||||
d['H'] = jsonObject.get("city")
|
||||
d['I'] = jsonObject.get("district")
|
||||
d['J'] = jsonObject.get("name")
|
||||
d['K'] = jsonObject.get("id")
|
||||
}
|
||||
|
||||
// def jsonObj = FangjiaClientUtils.addressStructure(d['B'], arrs[4])
|
||||
// if(jsonObj && jsonObj.result) {
|
||||
// def street = null
|
||||
// def street_number = null
|
||||
// if (jsonObj.result.street) {
|
||||
// d['E'] = jsonObj.result.street
|
||||
// }
|
||||
// if (jsonObj.result.streetNumber) {
|
||||
// d['F'] = jsonObj.result.streetNumber
|
||||
// }
|
||||
// d['G'] = jsonObj.result.name
|
||||
// }
|
||||
|
||||
// def rets = findProinvceAndCityAndRegion(FANGJIA_AREA_CODE, arrs[1], arrs[3])
|
||||
// if(rets && rets.size()==1){
|
||||
// def obj = rets[0]
|
||||
// d['B'] = obj.province
|
||||
// d['C'] = obj.fjw_city
|
||||
// d['D'] = obj.fjw_district
|
||||
// }
|
||||
}
|
||||
}
|
||||
});
|
||||
//
|
||||
//def findProinvceAndCityAndRegion(FANGJIA_AREA_CODE, cityCode, regionCode){
|
||||
// def q = new BasicDBObject()
|
||||
// q.put("city_code", cityCode.toString().toInteger())
|
||||
// q.put("district_code", regionCode.toString().toInteger())
|
||||
// def dbcursor = FANGJIA_AREA_CODE.find(q)
|
||||
// def rets = []
|
||||
// for(def d : dbcursor){
|
||||
// rets << d
|
||||
// }
|
||||
// return rets;
|
||||
//}
|
||||
|
||||
//ExcelUtils.modify("D:\\数据\\建行\\二期\\国家行政区划特殊城市导出.xlsx",{d->
|
||||
// def city = RegionData.formatCity(d['E'])
|
||||
// if(city && !d['J']){
|
||||
@@ -103,33 +175,33 @@ DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "townshi
|
||||
// }
|
||||
//})
|
||||
|
||||
ExcelUtils.modify("D:\\数据\\亲邻\\房价网省市区.xlsx",{d->
|
||||
if(!d['D']){
|
||||
def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN)
|
||||
if(infos && infos.size()==1){
|
||||
def info = infos[0]
|
||||
d['D'] = info.province_code
|
||||
d['E'] = info.area_code
|
||||
d['F'] = info.street_code
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
def findTownshipInfo(city, region, coll){
|
||||
def q = new BasicDBObject()
|
||||
q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE))
|
||||
q.put("street_name", Pattern.compile('^.*'+region+'街道.*$', Pattern.CASE_INSENSITIVE))
|
||||
|
||||
def dbcursor = coll.find(q)
|
||||
def rows = []
|
||||
for(def d : dbcursor){
|
||||
// if(d.street_name.contains(region)){
|
||||
rows << d
|
||||
//ExcelUtils.modify("D:\\数据\\亲邻\\房价网省市区.xlsx",{d->
|
||||
// if(!d['D']){
|
||||
// def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN)
|
||||
// if(infos && infos.size()==1){
|
||||
// def info = infos[0]
|
||||
// d['D'] = info.province_code
|
||||
// d['E'] = info.area_code
|
||||
// d['F'] = info.street_code
|
||||
// }
|
||||
}
|
||||
return rows
|
||||
}
|
||||
// }
|
||||
//})
|
||||
//
|
||||
//
|
||||
//def findTownshipInfo(city, region, coll){
|
||||
// def q = new BasicDBObject()
|
||||
// q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE))
|
||||
// q.put("street_name", Pattern.compile('^.*'+region+'街道.*$', Pattern.CASE_INSENSITIVE))
|
||||
//
|
||||
// def dbcursor = coll.find(q)
|
||||
// def rows = []
|
||||
// for(def d : dbcursor){
|
||||
//// if(d.street_name.contains(region)){
|
||||
// rows << d
|
||||
//// }
|
||||
// }
|
||||
// return rows
|
||||
//}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -209,4 +209,20 @@ class SFTP {
|
||||
return isDirExistFlag;
|
||||
}
|
||||
|
||||
public long getFileSize(String srcSftpFilePath, ChannelSftp sftp) {
|
||||
long fileSize;//文件大于等于0则存在
|
||||
try {
|
||||
SftpATTRS sftpATTRS = sftp.lstat(srcSftpFilePath);
|
||||
fileSize = sftpATTRS.getSize();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace()
|
||||
fileSize = -1;//获取文件大小异常
|
||||
if (e.getMessage().toLowerCase().equals("no such file")) {
|
||||
fileSize = -2;//文件不存在
|
||||
}
|
||||
}
|
||||
return fileSize;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+11
-9
@@ -1,6 +1,7 @@
|
||||
package com.fangjia.script.temp.shenjian.poi
|
||||
|
||||
import com.alibaba.fastjson.JSONObject
|
||||
import com.fangjia.script.temp.shenjian.util.BaiDuUtils
|
||||
import com.fangjia.script.temp.shenjian.util.EsUtils
|
||||
import com.fangjia.script.temp.shenjian.util.GaoDeUtils
|
||||
import com.fangjia.script.util.ElasticUtils
|
||||
@@ -15,25 +16,26 @@ import java.util.concurrent.Executors
|
||||
*/
|
||||
class FillLngLat {
|
||||
|
||||
static ExecutorService executorService = Executors.newFixedThreadPool(4)
|
||||
// static ExecutorService executorService = Executors.newFixedThreadPool(4)
|
||||
static void main(String[] args) {
|
||||
ElasticUtils.executeSqlQuery("select * from dws_poi where location is not null", { dataT ->
|
||||
ElasticUtils.executeSqlQuery("select * from dws_poi where location is null", { dataT ->
|
||||
final def data = dataT
|
||||
executorService.submit(new Runnable() {
|
||||
@Override
|
||||
void run() {
|
||||
// executorService.submit(new Runnable() {
|
||||
// @Override
|
||||
// void run() {
|
||||
println(data)
|
||||
def lngLat = GaoDeUtils.parserByGaode(data.city, data.region + data.name + data.address)
|
||||
def lngLat = BaiDuUtils.parserByBaidu(data.city, data.region + data.name + data.address)
|
||||
Thread.sleep(1000)
|
||||
if (lngLat != null && lngLat.size() == 2 ) {
|
||||
JSONObject jsonObject = new JSONObject()
|
||||
jsonObject.put("lon", Double.valueOf(lngLat['lng']))
|
||||
jsonObject.put("lat", Double.valueOf(lngLat['lat']))
|
||||
EsUtils.bulkUpdateFieldByIds("dws_poi", "location", jsonObject, Arrays.asList(data.source_id))
|
||||
}
|
||||
}
|
||||
})
|
||||
// }
|
||||
// })
|
||||
|
||||
})
|
||||
executorService.shutdown()
|
||||
//executorService.shutdown()
|
||||
}
|
||||
}
|
||||
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.fangjia.script.temp.shenjian.util
|
||||
|
||||
import com.alibaba.fastjson.JSONObject
|
||||
import com.fangjia.core.util.GeoUtils
|
||||
import com.fangjia.core.util.HttpRequest
|
||||
import com.fangjia.script.util.DataUtil
|
||||
import org.apache.commons.lang.StringUtils
|
||||
|
||||
/**
|
||||
* 百度工具类
|
||||
*
|
||||
* @author shenjian
|
||||
* @since 2022/10/28
|
||||
*/
|
||||
class BaiDuUtils {
|
||||
|
||||
def static final String KEY = "6w9SEHS3hnAFjmY2oEhqIDdgvLPKWXu5"
|
||||
|
||||
/**
|
||||
* 百度地址逆解析,返回高德坐标!!!!!!!!!!!!!!!
|
||||
* @param city
|
||||
* @param address
|
||||
*/
|
||||
def static parserByBaidu(def city, def address) {
|
||||
Map<String, String> params = new HashMap<String, String>()
|
||||
params.put("city", city)
|
||||
if (StringUtils.isBlank(address)) {
|
||||
return []
|
||||
}
|
||||
params.put("address", address.replaceAll("null", ""))
|
||||
params.put("output", "json")
|
||||
params.put("ak", KEY)
|
||||
params.put("callback", "showLocation")
|
||||
|
||||
String content
|
||||
content = new HttpRequest().get("https://api.map.baidu.com/geocoding/v3/", params, "utf-8")
|
||||
//content = "showLocation&&showLocation({\"status\":0,\"result\":{\"location\":{\"lng\":131.04009309945693,\"lat\":45.78426770180344},\"precise\":1,\"confidence\":70,\"comprehension\":100,\"level\":\"地产小区\"}})"
|
||||
content = content.replaceAll("showLocation&&showLocation\\(", "").replaceAll("\\)", "")
|
||||
JSONObject json = JSONObject.parseObject(content)
|
||||
if (json.status == 0 && json.result && json.result.location) {
|
||||
def bd_lng = json.result.location.lng
|
||||
def bd_lat = json.result.location.lat
|
||||
Map<String, Double> locationMap = GeoUtils.bd09ToGcj02(bd_lat, bd_lng)
|
||||
return ["lng": com.fangjia.core.util.DataUtil.getDoubleRound(6, locationMap['lng']), "lat": com.fangjia.core.util.DataUtil.getDoubleRound(6, locationMap['lat'])]
|
||||
}
|
||||
return []
|
||||
}
|
||||
}
|
||||
+29
@@ -247,6 +247,35 @@ class GaoDeUtils {
|
||||
return Collections.emptyList()
|
||||
}
|
||||
|
||||
|
||||
static List<AmapPoi> getAmapById2(id){
|
||||
def params = [:]
|
||||
params.id = id
|
||||
params.output = 'json'
|
||||
params.key = "66e6771767ab293ace441553c36621c1"
|
||||
JSONObject json = HttpRequestUtil.getJsonContent("https://restapi.amap.com/v5/place/detail", params);
|
||||
if (json == null) {
|
||||
json = HttpRequestUtil.getJsonContent("https://restapi.amap.com/v5/place/detail", params);
|
||||
}
|
||||
if (json && json.info && json.info == "OK") {
|
||||
try {
|
||||
List<AmapPoi> ret = JSONObject.parseArray(json.pois.toString(), AmapPoi.class)
|
||||
return ret
|
||||
} catch(Exception ex) {
|
||||
ex.printStackTrace()
|
||||
}
|
||||
} else if (json && json.infocode && json.infocode == "10044") {
|
||||
System.exit(1)
|
||||
} else if (json && json.infocode && json.infocode == "10004") {
|
||||
// 开发者的单位时间内(1分钟)访问量超限,被系统自动封停,下一分钟自动解封。
|
||||
Thread.sleep(60000)
|
||||
} else if (json && json.infocode && json.infocode == "10017") {
|
||||
// 所请求的资源不可用
|
||||
System.exit(1)
|
||||
}
|
||||
return Collections.emptyList()
|
||||
}
|
||||
|
||||
/**
|
||||
* »ñÈ¡ÏêÇé
|
||||
*/
|
||||
|
||||
+10
-7
@@ -91,11 +91,9 @@ class DataStandardBatch extends BaseBatch{
|
||||
// ThirdPartPriceDataRepeatBatchUtils.findThirdPriceDataRepeatBatch(SHORT_DATE, thirdPartyColl)
|
||||
|
||||
cityMap.each{city,alias->
|
||||
// if(city == "굇쑴"){
|
||||
println "역迦속潼±${city}×"
|
||||
def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"])
|
||||
districtMap.putAll(detailMap)
|
||||
// }
|
||||
println "开始加载【${city}】"
|
||||
def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"])
|
||||
districtMap.putAll(detailMap)
|
||||
}
|
||||
|
||||
while(flag){
|
||||
@@ -502,6 +500,8 @@ class DataStandardBatch extends BaseBatch{
|
||||
type = 12;//ÇøÓò²»Í¬
|
||||
district = null;
|
||||
}else{
|
||||
def score = CosineSimilarAlgorithm.getSimilarity(district.name, copyObj.name)
|
||||
district.score = score //此处用来做测试
|
||||
type=15
|
||||
}
|
||||
}
|
||||
@@ -920,9 +920,9 @@ class DataStandardBatch extends BaseBatch{
|
||||
def findAllNoMatchData(){
|
||||
DBObject qdata = new BasicDBObject();
|
||||
qdata.put("s_date", SHORT_DATE)
|
||||
// qdata.put("city","굇쑴")
|
||||
// qdata.put("city","福州")
|
||||
// qdata.put("source","°²¾Ó¿Í")
|
||||
// qdata.put("name",Pattern.compile("쏜袋음袞.*"))
|
||||
// qdata.put("name",Pattern.compile("龚家宅.*"))
|
||||
qdata.put("status", new BasicDBObject(QueryOperators.EXISTS, false));
|
||||
def ret = []
|
||||
try{
|
||||
@@ -1065,6 +1065,9 @@ class DataStandardBatch extends BaseBatch{
|
||||
udata2.put("match_region", district.region);
|
||||
udata2.put("match_name", district.name);
|
||||
udata2.put("match_address", district.address);
|
||||
if(district.score){
|
||||
udata2.put("score", district.score);
|
||||
}
|
||||
udata2.put("avg_price", data.avg_price);
|
||||
udata2.put("type", type);
|
||||
udata2.put("tid", data._id.toString());
|
||||
|
||||
+4
-4
@@ -40,11 +40,11 @@ class DataStat {
|
||||
|
||||
|
||||
def run(){
|
||||
def source = "°²¾Ó¿Í"//
|
||||
def citys = findCrawlCity(source, 202208);
|
||||
def source = "365ÌÔ·¿"//
|
||||
def citys = findCrawlCity(source, 202211);
|
||||
for(def city : citys){
|
||||
def count1 = findCount(source, city, 202208);
|
||||
def count2 = findCount(source, city, 202209);
|
||||
def count1 = findCount(source, city, 202211);
|
||||
def count2 = findCount(source, city, 202212);
|
||||
println city +" "+count1+" "+count2
|
||||
// println count1
|
||||
// println "--- ----"
|
||||
|
||||
+6
-7
@@ -24,8 +24,9 @@ class SynchDistrictPrice extends BaseBatch{
|
||||
// "anjuke.com":"安居客","cityhouse.cn":"城市房产","zhuge.com":"诸葛找房","5i5j.com":"我爱我家","jiwu.com":"吉屋"]
|
||||
def sourceMap = ["ke.com":"贝壳找房","cityhouse.cn":"城市房产"]
|
||||
|
||||
// "吉屋":"吉屋","365淘房":"365淘房","我爱我家":"我爱我家","诸葛找房APP":"诸葛找房","贝壳":"贝壳找房","链家":"链家","Q房":"Q房","麦田":"麦田","中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","乐有家":"乐有家","C21":"C21","城市房产":"城市房产"
|
||||
def esSources = ["中原地产":"中原地产"]
|
||||
// "吉屋":"吉屋","365淘房":"365淘房","我爱我家":"我爱我家","诸葛找房APP":"诸葛找房","贝壳":"贝壳找房","链家":"链家","Q房":"Q房","麦田":"麦田",
|
||||
// "中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","乐有家":"乐有家","C21":"C21","城市房产":"城市房产","兔博士PC端":"兔博士"
|
||||
def esSources = ["我爱我家":"我爱我家","兔博士PC端":"兔博士","吉屋":"吉屋","贝壳找房":"贝壳找房","乐有家":"乐有家","365淘房":"365淘房","诸葛找房APP":"诸葛找房","链家":"链家","Q房":"Q房","麦田":"麦田","中原地产":"中原地产","安居客小程序":"安居客","搜房":"搜房","C21":"C21","城市房产":"城市房产"]
|
||||
|
||||
|
||||
static main(args) {
|
||||
@@ -145,7 +146,7 @@ class SynchDistrictPrice extends BaseBatch{
|
||||
println "["+source +"-"+city + "] add:"+ rets.size()+" 原抓取:"+count
|
||||
}else{
|
||||
for(def r : rets){
|
||||
def obj= findIsExists(r.city, r.region, r.name, r.estate_type, SHORT_DATE, source)
|
||||
def obj= findIsExists(r.city, r.region, r.name, SHORT_DATE, source)
|
||||
if(obj){
|
||||
updateIndex++
|
||||
// thirdPartyColl.remove(new BasicDBObject('_id',obj._id))
|
||||
@@ -183,16 +184,14 @@ class SynchDistrictPrice extends BaseBatch{
|
||||
|
||||
}
|
||||
|
||||
def findIsExists(def city, def region, def name, estate_type, def sDate, def source){
|
||||
def findIsExists(def city, def region, def name, def sDate, def source){
|
||||
def q = new BasicDBObject()
|
||||
q.put("source", source)
|
||||
q.put("s_date", sDate)
|
||||
q.put("city", city)
|
||||
q.put("region", region)
|
||||
q.put("name", name)
|
||||
if(estate_type){
|
||||
q.put("estate_type",estate_type)
|
||||
}
|
||||
|
||||
def obj = thirdPartyColl.findOne(q)
|
||||
return obj
|
||||
}
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@ class TestCrawlTotalCount {
|
||||
def run(){
|
||||
def sources = ["房估估","诸葛找房","安居客","搜房","中原地产","赶集","链家","兔博士","城市房产","贝壳找房","Q房","Q房(新)","中原地产(新)","乐有家","乐有家(新)","房探","房多多","小资家","我爱我家","麦田","房途","C21","乐居","房产超市","58同城","365淘房","吉屋"]
|
||||
for(def source :sources){
|
||||
def count1 = findTotalCount(source, 202208);
|
||||
def count2 = findTotalCount(source, 202209);
|
||||
def count1 = findTotalCount(source, 202211);
|
||||
def count2 = findTotalCount(source, 202212);
|
||||
println source +" "+count1 +" "+count2
|
||||
}
|
||||
}
|
||||
|
||||
+15
-14
@@ -81,8 +81,8 @@ class ThirdDataToGatherBatch extends BaseBatch{
|
||||
println "小区添加价格完成"
|
||||
districts = addOtherWebsitePrice(districts);
|
||||
println "小区添加第三方价格完成"
|
||||
districts = addLevel(districts);
|
||||
println "Ð¡ÇøÆÀ¼¶Íê³É"
|
||||
// districts = addLevel(districts);
|
||||
// println "Ð¡ÇøÆÀ¼¶Íê³É"
|
||||
saveOrUpdate(districts);
|
||||
println city + "保存修改完成"
|
||||
toLineDB(city)
|
||||
@@ -101,16 +101,16 @@ class ThirdDataToGatherBatch extends BaseBatch{
|
||||
def tempPrice = d.get(field+"_price")
|
||||
if(!tempPrice){
|
||||
d.put(field+"_price", m.avg_price.toInteger())
|
||||
if(d.fangjia_price && m.avg_price){
|
||||
if(d.fangjia_price){
|
||||
try{
|
||||
d.put(field+"_diff", diffPercent(d.fangjia_price.toInteger(), m.avg_price.toInteger()))
|
||||
}catch(Exception e){
|
||||
println "dddd"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
// if(d.fangjia_price && m.avg_price){
|
||||
// if(d.fangjia_price){
|
||||
// try{
|
||||
// d.put(field+"_diff", diffPercent(d.fangjia_price.toInteger(), m.avg_price.toInteger()))
|
||||
// }catch(Exception e){
|
||||
// println "dddd"
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
}else{
|
||||
@@ -208,8 +208,9 @@ class ThirdDataToGatherBatch extends BaseBatch{
|
||||
query.put("s_date", SHORT_DATE)
|
||||
|
||||
DBObject udata = new BasicDBObject()
|
||||
udata.put("level",d.level);
|
||||
udata.put("last_price", d.last_price);
|
||||
// udata.put("level",d.level);
|
||||
// udata.put("last_price", d.last_price);
|
||||
udata.put("seaweed_id", d._id.toString())
|
||||
udata.put("fangjia_price", d.fangjia_price);
|
||||
|
||||
fieldMap.each{k,v->
|
||||
|
||||
@@ -109,7 +109,8 @@ public class DataUtil {
|
||||
//System.out.println(isCellPhoneNumber("15221169682"));
|
||||
//System.out.println(isCellPhoneNumber("12345611123"));
|
||||
//println getRound(2,125.269);
|
||||
println formateAddress("ËÕÖÝ","½ËÕ·56ºÅ");
|
||||
// println formateAddress("ËÕÖÝ","½ËÕ·56ºÅ");
|
||||
|
||||
}
|
||||
|
||||
public static String getHanzi(String s) {
|
||||
@@ -243,7 +244,7 @@ public class DataUtil {
|
||||
return "";
|
||||
}
|
||||
String regEx = "<[^>]*(>)?";
|
||||
return str.replaceAll(regEx, "");
|
||||
return str.replaceAll(regEx, " ");
|
||||
}
|
||||
|
||||
public static Pattern nameTags = Pattern.compile('</?([^>]*)(\\s|$|>)');
|
||||
|
||||
@@ -221,6 +221,9 @@ class ElasticUtils {
|
||||
searchHit.getSourceAsMap().put("id", searchHit.getId());
|
||||
results << searchHit.getSourceAsMap()
|
||||
}
|
||||
if(results.size()%100000==0){
|
||||
println "."+ new Date()
|
||||
}
|
||||
SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId);
|
||||
scrollRequest.scroll(scroll);
|
||||
searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT);
|
||||
|
||||
@@ -65,6 +65,8 @@ class MongoUtils {
|
||||
if (domainUrl == MongoDB_Domain_mongo) {
|
||||
port == 28017;
|
||||
}
|
||||
|
||||
|
||||
if ((domainUrl == "192.168.0.136") && (port == 27017 || port == 28017)) {
|
||||
return com.fangjia.core.util.MongoUtils.getDbCollection(Constants.TEST_FANGJIA_MONGO_URI, db, name)
|
||||
}
|
||||
|
||||
@@ -52,6 +52,22 @@ public class OpenApiClient {
|
||||
return false
|
||||
}
|
||||
|
||||
public static def search(def city, def district, def name){
|
||||
Map<String, String> params = new HashMap<String, String>()
|
||||
params.put("city", city);
|
||||
params.put("keyword", name);
|
||||
params.put("district", district)
|
||||
params.put("token", TOKEN);
|
||||
String content = new HttpRequest().get("http://open.fangjia.com/property/search", params, "utf-8")
|
||||
JSONObject jsonObj = JSONObject.fromObject(content)
|
||||
JSONArray array = jsonObj.get("result")
|
||||
def matchObj = null
|
||||
if(array){
|
||||
matchObj = array[0]
|
||||
}
|
||||
return matchObj
|
||||
}
|
||||
|
||||
public static List searchDistrict(double lng, double lat, int r, String city) {
|
||||
DecimalFormat format = new DecimalFormat("#.0000000000");
|
||||
try {
|
||||
@@ -348,6 +364,7 @@ public class OpenApiClient {
|
||||
}
|
||||
|
||||
|
||||
//此接口地址标准化,带补全
|
||||
public static JSONObject standard1Action(String city, String address) {
|
||||
try {
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
@@ -1088,6 +1105,30 @@ public class OpenApiClient {
|
||||
return null
|
||||
}
|
||||
|
||||
public static JSONObject addressEvaluation(city, region, address, size){
|
||||
try {
|
||||
HttpRequest request = new HttpRequest();
|
||||
Map<String, String> params = new HashMap<String, String>();
|
||||
params.put("city", city);
|
||||
params.put("district", region);
|
||||
params.put("address", address);
|
||||
params.put("size", String.valueOf(size));
|
||||
params.put("token", TOKEN);
|
||||
String response = request.get("http://open.fangjia.com/property/addressEvaluate", params, "UTF-8");
|
||||
JSONObject result = JSONObject.fromObject(response);
|
||||
if (result.getInt("code") == 200) {
|
||||
if (result.containsKey("result")) {
|
||||
return result.getJSONObject("result")
|
||||
}
|
||||
} else if (result.getInt("code") == 500) {
|
||||
println("地址估价失败:${city} ${address} ${size} ${result}")
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
public static JSONObject evaluateDistrictPriceByAddress(String city, String address, double size) {
|
||||
try {
|
||||
HttpRequest request = new HttpRequest();
|
||||
|
||||
+6
-4
@@ -11,8 +11,8 @@ import org.bson.Document
|
||||
import static com.mongodb.client.model.Filters.*
|
||||
|
||||
MongoCollection<Document> OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log")
|
||||
def startDate = DateUtil.parseDate("20220601", "yyyyMMdd")
|
||||
def endDate = DateUtil.parseDate("20220701", "yyyyMMdd")
|
||||
def startDate = DateUtil.parseDate("20220901", "yyyyMMdd")
|
||||
def endDate = DateUtil.parseDate("20221001", "yyyyMMdd")
|
||||
Calendar calendar = Calendar.getInstance()
|
||||
calendar.setTime(startDate)
|
||||
def count = 0
|
||||
@@ -25,7 +25,7 @@ while (startDate.before(endDate)) {
|
||||
OPEN_URI_LOG.find(and(eq("user_id", "1007705"), eq("request_uri", "/property/detail"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc ->
|
||||
def result = JSONObject.fromObject(doc.res_map.result)
|
||||
if (!hashSet.contains(result)) {
|
||||
def item = ["60a3202c0b42a00001aad385", "qlkjgx", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()]
|
||||
def item = ["60a3202c0b42a00001aad385", "qlkj", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()]
|
||||
data << item
|
||||
hashSet << result
|
||||
} else {
|
||||
@@ -38,4 +38,6 @@ while (startDate.before(endDate)) {
|
||||
|
||||
startDate = nextDate
|
||||
}
|
||||
ExcelUtils.write("D:\\亲邻数据${startDate.format('yyyyMM')}.xlsx", data, "查询日志")
|
||||
ExcelUtils.write("D:\\亲邻数据${startDate.format('yyyyMM')}.xlsx", data, "查询日志")
|
||||
|
||||
|
||||
|
||||
-1
@@ -82,7 +82,6 @@ import com.fangjia.service.util.ServiceUtil;
|
||||
import com.fangjia.service.web.FangjiaHighlighter;
|
||||
import com.fangjia.service.web.MenuService;
|
||||
|
||||
import javax.jws.WebService;
|
||||
|
||||
public class DistrictServiceImpl implements DistrictService {
|
||||
/**
|
||||
|
||||
-13
@@ -1,25 +1,12 @@
|
||||
package com.fangjia.service.map;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.fangjia.core.util.HttpRequest;
|
||||
import com.fangjia.core.util.SourceNameUtil;
|
||||
import com.fangjia.core.util.StringUtil;
|
||||
import com.fangjia.dal.mongo.address.dao.AMapAddressDao;
|
||||
import com.fangjia.dal.mongo.address.dao.AMapAddressDaoImpl;
|
||||
import com.fangjia.dal.mongo.address.model.AMapAddressPOIResult;
|
||||
import com.fangjia.service.bo.*;
|
||||
import com.fangjia.service.bo.map.*;
|
||||
import com.fangjia.service.util.ABYun.ABuYunUtil;
|
||||
import com.fangjia.service.util.AmapUtil;
|
||||
import com.huaban.analysis.jieba.JiebaSegmenter;
|
||||
import net.sf.ezmorph.array.AbstractArrayMorpher;
|
||||
import net.sf.ezmorph.array.BooleanObjectArrayMorpher;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.lucene.util.CollectionUtil;
|
||||
import org.omg.CORBA.OBJ_ADAPTER;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
|
||||
+11
-4
@@ -7,12 +7,14 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.fangjia.core.util.CacheUtils;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
||||
import com.fangjia.dal.QueryParam;
|
||||
import com.fangjia.dal.sql.dao.UserDao;
|
||||
import com.fangjia.dal.sql.model.User;
|
||||
import org.sothis.core.util.Closure;
|
||||
|
||||
public class UserServiceImpl implements UserService {
|
||||
private UserDao userDao;
|
||||
@@ -28,10 +30,15 @@ public class UserServiceImpl implements UserService {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
public User findByUserName(String userName) {
|
||||
List<QueryParam> params = new ArrayList<QueryParam>(1);
|
||||
params.add(new QueryParam("userName", userName));
|
||||
return userDao.findFirstByParams(params);
|
||||
public User findByUserName(final String userName) {
|
||||
return CacheUtils.getValue(UserServiceImpl.class, "findByUserName", userName, CacheUtils.CachePolicyEnum.TODAY, new Closure<User, String>(){
|
||||
@Override
|
||||
public User execute(String input) {
|
||||
List<QueryParam> params = new ArrayList<QueryParam>(1);
|
||||
params.add(new QueryParam("userName", userName));
|
||||
return userDao.findFirstByParams(params);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void updateUser(User user) {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 281 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 102 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.6 MiB |
Reference in New Issue
Block a user