Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+8
@@ -42,6 +42,8 @@ public class BuildingRatioController {
|
||||
buildingRatio.setM_date(date);
|
||||
buildingRatio.setCreate_user(model.getCreate_user());
|
||||
buildingRatio.setNote(model.getNote());
|
||||
buildingRatio.setBuilding_avg_price(model.getBuilding_avg_price());
|
||||
buildingRatio.setAvg_price(model.getAvg_price());
|
||||
this.buildingRatioService.save(buildingRatio);
|
||||
|
||||
model.setMsg("新建成功!");
|
||||
@@ -76,6 +78,8 @@ public class BuildingRatioController {
|
||||
data_buildingRatio.put("region", model.getRegion());
|
||||
data_buildingRatio.put("district", model.getDistrict());
|
||||
data_buildingRatio.put("building_name", model.getBuilding_name());
|
||||
data_buildingRatio.put("building_avg_price", model.getBuilding_avg_price());
|
||||
data_buildingRatio.put("avg_price", model.getAvg_price());
|
||||
data_buildingRatio.put("ratio", model.getRatio());
|
||||
data_buildingRatio.put("m_date", new Date());
|
||||
data_buildingRatio.put("create_user", model.getCreate_user());
|
||||
@@ -103,6 +107,8 @@ public class BuildingRatioController {
|
||||
bo.setRegion(buildingRatio.getRegion());
|
||||
bo.setDistrict(buildingRatio.getDistrict());
|
||||
bo.setBuilding_name(buildingRatio.getBuilding_name());
|
||||
bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price());
|
||||
bo.setAvg_price(buildingRatio.getAvg_price());
|
||||
bo.setRatio(buildingRatio.getRatio());
|
||||
bo.setC_date(buildingRatio.getC_date());
|
||||
bo.setM_date(buildingRatio.getM_date());
|
||||
@@ -135,6 +141,8 @@ public class BuildingRatioController {
|
||||
bo.setRegion(buildingRatio.getRegion());
|
||||
bo.setDistrict(buildingRatio.getDistrict());
|
||||
bo.setBuilding_name(buildingRatio.getBuilding_name());
|
||||
bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price());
|
||||
bo.setAvg_price(buildingRatio.getAvg_price());
|
||||
bo.setRatio(buildingRatio.getRatio());
|
||||
bo.setCreate_user(buildingRatio.getCreate_user());
|
||||
bo.setNote(buildingRatio.getNote());
|
||||
|
||||
@@ -17,6 +17,8 @@ public class BuildingRatioModel extends BaseModel{
|
||||
private String region;
|
||||
private String district;
|
||||
private String building_name;
|
||||
private String avg_price;
|
||||
private String building_avg_price;
|
||||
private String create_user;
|
||||
private String note;
|
||||
private Double ratio;
|
||||
@@ -131,4 +133,20 @@ public class BuildingRatioModel extends BaseModel{
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
|
||||
public String getAvg_price() {
|
||||
return avg_price;
|
||||
}
|
||||
|
||||
public void setAvg_price(String avg_price) {
|
||||
this.avg_price = avg_price;
|
||||
}
|
||||
|
||||
public String getBuilding_avg_price() {
|
||||
return building_avg_price;
|
||||
}
|
||||
|
||||
public void setBuilding_avg_price(String building_avg_price) {
|
||||
this.building_avg_price = building_avg_price;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,9 +46,19 @@
|
||||
<td>楼栋名称</td>
|
||||
<td><input name="building_name" value="${building_name!}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋均价</td>
|
||||
<td><input name="building_avg_price" oninput="getRatio()" value="${building_avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>小区均价</td>
|
||||
<td><input name="avg_price" oninput="getRatio()" value="${avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋系数</td>
|
||||
<td><input name="ratio" value="${ratio!}" /></td>
|
||||
<td><input id="ratio" name="ratio" value="${ratio!}" readonly="true"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>创建人</td>
|
||||
@@ -66,6 +76,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
function getRatio() {
|
||||
var building_avg_price = $("input[name='building_avg_price']").val();
|
||||
var avg_price = $("input[name='avg_price']").val();
|
||||
if(typeof(building_avg_price) == "undefined" || building_avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
if(typeof(avg_price) == "undefined" || avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
var ratio = building_avg_price/avg_price;
|
||||
var num = new Number(ratio);
|
||||
$("#ratio").val(num.toFixed(2));
|
||||
}
|
||||
function submitForm(){
|
||||
var city_name = $("input[name='city_name']").val();
|
||||
var region = $("input[name='region']").val();
|
||||
|
||||
@@ -51,9 +51,19 @@
|
||||
<input name="id" value="${buildingRatioBo.id!}" type="hidden"/>
|
||||
<td><input name="building_name" value="${buildingRatioBo.building_name!}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋均价</td>
|
||||
<td><input name="building_avg_price" oninput="getRatio()" value="${buildingRatioBo.building_avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>小区均价</td>
|
||||
<td><input name="avg_price" oninput="getRatio()" value="${buildingRatioBo.avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋系数</td>
|
||||
<td><input name="ratio" value="${buildingRatioBo.ratio!}" /></td>
|
||||
<td><input id="ratio" name="ratio" value="${buildingRatioBo.ratio!}" readonly="true"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>创建人</td>
|
||||
@@ -72,6 +82,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
function getRatio() {
|
||||
var building_avg_price = $("input[name='building_avg_price']").val();
|
||||
var avg_price = $("input[name='avg_price']").val();
|
||||
if(typeof(building_avg_price) == "undefined" || building_avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
if(typeof(avg_price) == "undefined" || avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
var ratio = building_avg_price/avg_price;
|
||||
var num = new Number(ratio);
|
||||
$("#ratio").val(num.toFixed(2));
|
||||
}
|
||||
function submitForm() {
|
||||
var city_name = $("input[name='city_name']").val();
|
||||
var region = $("input[name='region']").val();
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<th align="center" width="55px">
|
||||
ID
|
||||
</th>
|
||||
<th align="center" width="100px">
|
||||
<th align="center" width="50px">
|
||||
城市
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
@@ -48,16 +48,22 @@
|
||||
<th align="center" width="60px">
|
||||
楼栋名称
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
楼栋均价
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
小区均价
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
楼栋系数
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
创建人
|
||||
</th>
|
||||
<th align="center" width="200px">
|
||||
<th align="center" width="150px">
|
||||
创建日期
|
||||
</th>
|
||||
<th align="center" width="200px">
|
||||
<th align="center" width="150px">
|
||||
修改日期
|
||||
</th>
|
||||
<th align="center" width="100px">
|
||||
@@ -86,6 +92,12 @@
|
||||
<td align="center">
|
||||
${bo.building_name!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.building_avg_price!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.avg_price!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.ratio!}
|
||||
</td>
|
||||
|
||||
+4
@@ -165,6 +165,7 @@ public class SaleLeadsController {
|
||||
|
||||
}
|
||||
|
||||
|
||||
saleLeads = converValue(saleLeads);
|
||||
String body =
|
||||
"业务需求:" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n"
|
||||
@@ -363,11 +364,14 @@ public class SaleLeadsController {
|
||||
if (saleLeads.getId()!=null) {
|
||||
saleLeads.setId(null);
|
||||
}
|
||||
|
||||
String ip = AnalyticsUtil.getIpAddress(req);
|
||||
saleLeads = converValue(saleLeads);
|
||||
String body =
|
||||
"业务需求:" + saleLeads.getBusiness() + "\n\n"
|
||||
+ "姓名:" + saleLeads.getUname() + "\n\n"
|
||||
+ "手机:" + saleLeads.getMobile() + "\n\n"
|
||||
+ "IP:"+ip + "\n\n"
|
||||
+ "咨询内容:" + saleLeads.getRemarks()+ "\n\n" ;
|
||||
body = body.replaceAll("null", "").replaceAll("其他,请填写", "");
|
||||
if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) {
|
||||
|
||||
@@ -99,6 +99,27 @@
|
||||
@media(max-device-width:320px){
|
||||
.searchBoxIndex{top:13.5rem;}
|
||||
}
|
||||
.advert {
|
||||
position: fixed;
|
||||
top: 30%;
|
||||
left: 40%;
|
||||
right: 0;
|
||||
height: 320px;
|
||||
width: 580px;
|
||||
z-index: 10000;
|
||||
}
|
||||
|
||||
.left-ad {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 580px;
|
||||
height: 300px;
|
||||
background: url("${staticUrl}/images/fangjia/v5/adv.png");
|
||||
background-size: 100% 100%;
|
||||
|
||||
}
|
||||
.advert a{ float: right;margin-right: 10px;cursor: pointer;font-weight: bold;}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
@@ -108,6 +129,10 @@
|
||||
|
||||
<#include "/header/v5/_header.ftl"/>
|
||||
|
||||
<#--<div class="advert mobile01">-->
|
||||
<#-- <a id="close">关闭</a>-->
|
||||
<#-- <div class="left-ad"></div>-->
|
||||
<#--</div>-->
|
||||
|
||||
<div class="bannerIndex">
|
||||
<div class="imgBoxIndex">
|
||||
@@ -556,7 +581,18 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="//developer.baidu.com/map/jsdemo/demo/convertor.js"></script>
|
||||
<script src="${staticUrl}/js/fangjia/v5/city.js?v=${version}"></script>
|
||||
<script>
|
||||
|
||||
// function closeWin(){
|
||||
// $(".advert").addClass("dn")
|
||||
// }
|
||||
//
|
||||
// $("#close").click(function(){
|
||||
// closeWin();
|
||||
// })
|
||||
// window.setInterval(closeWin, 10000)
|
||||
//
|
||||
// $(".left-ad").click(function(){
|
||||
// window.open('https://jinshuju.net/f/hBkMVo','_blank');
|
||||
// })
|
||||
/* banner轮播 */
|
||||
$(".imgBoxIndex > div").hide();
|
||||
$(".imgBoxIndex > div").eq(0).show();
|
||||
|
||||
+18
-1
@@ -27,7 +27,8 @@ public class BuildingRatio implements MongoEntity {
|
||||
private String region;
|
||||
private String district;
|
||||
private String building_name;
|
||||
|
||||
private String building_avg_price;
|
||||
private String avg_price;
|
||||
private Double ratio;
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date c_date;
|
||||
@@ -110,4 +111,20 @@ public class BuildingRatio implements MongoEntity {
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
@Column(name = "building_avg_price")
|
||||
public String getBuilding_avg_price() {
|
||||
return building_avg_price;
|
||||
}
|
||||
|
||||
public void setBuilding_avg_price(String building_avg_price) {
|
||||
this.building_avg_price = building_avg_price;
|
||||
}
|
||||
@Column(name = "avg_price")
|
||||
public String getAvg_price() {
|
||||
return avg_price;
|
||||
}
|
||||
|
||||
public void setAvg_price(String avg_price) {
|
||||
this.avg_price = avg_price;
|
||||
}
|
||||
}
|
||||
|
||||
+7
-12
@@ -179,7 +179,7 @@ public class AddrSvcController {
|
||||
/**
|
||||
* 地址匹配
|
||||
*/
|
||||
public Object matchAction(AddesssMatchModel model) {
|
||||
public Object matchAction(AddesssMatchModel model) throws Exception {
|
||||
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
if (StringUtils.isBlank(model.getAddress())) {
|
||||
@@ -195,18 +195,13 @@ public class AddrSvcController {
|
||||
params.put("category", model.getCategory());
|
||||
params.put("district", model.getSuggestDistrict());
|
||||
try {
|
||||
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/match", params, "UTF-8");
|
||||
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(CommonDtoUtils.transformV(MatchedBuildingDto.class, json.get("result")));
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
//新匹配接口
|
||||
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8");
|
||||
BasicModel basicModel = new BasicModel(0, "ok");
|
||||
if (json != null && json.size()>0) {
|
||||
basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json));
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中..."));
|
||||
|
||||
+3
-3
@@ -392,12 +392,12 @@ class DealPriceDataProcess {
|
||||
|
||||
def deleteThirdPartyData(){
|
||||
def citys = CcbCommonUtils.citys_all
|
||||
def month = 202305
|
||||
def month = 202306
|
||||
def rows = []
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
def set = new HashSet()
|
||||
for(def city : citys) {
|
||||
def rets = findPeGteThirdParty2(city, 202306)
|
||||
def rets = findPeGteThirdParty2(city, 202307)
|
||||
def total = 0
|
||||
println city +" "+rets.size()
|
||||
if(rets){
|
||||
@@ -437,7 +437,7 @@ class DealPriceDataProcess {
|
||||
}
|
||||
|
||||
def findPeGteThirdParty2(cityName, yearmonth){
|
||||
def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='第三方' and urbn_nm='${cityName}' and gujia_mns_rto>25"
|
||||
def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='第三方' and urbn_nm='${cityName}' and gujia_mns_rto>20"
|
||||
def rets = []
|
||||
pgsqlInstance.eachRow(sql,{r->
|
||||
def map = [:]
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||
|
||||
//添加自己库中的人工指导价
|
||||
def prices = CcbCommonUtils.findPersonPrice(city, "2023-06-26", "2023-07-22")
|
||||
def prices = CcbCommonUtils.findPersonPrice(city, "2023-06-26", "2023-07-26")
|
||||
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
||||
if(prices){
|
||||
def distMap = getDistrictMap(city)
|
||||
@@ -85,7 +85,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
||||
saveToPgSql(rows)
|
||||
//
|
||||
//更新静态数据表
|
||||
updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28")
|
||||
// updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28")
|
||||
|
||||
}
|
||||
|
||||
|
||||
+36
-33
@@ -37,44 +37,47 @@ class ExportAllPgData {
|
||||
// exportEvaluationRateData()
|
||||
// exportBigdataPoiData()
|
||||
// exportBigdataDistrictData()
|
||||
////
|
||||
//// //第三方网站权重表
|
||||
//////
|
||||
////// //第三方网站权重表
|
||||
// exportWebsiteRate();
|
||||
//
|
||||
////
|
||||
// exportGuidedPrice()//随人工改变//
|
||||
// exportCommunityGuidedPrice()//随政策//
|
||||
// //处理小区情况
|
||||
//// //处理小区情况
|
||||
// exportCommunityStaging()//没cityid
|
||||
// exportBigdataCommunity()//
|
||||
//
|
||||
////
|
||||
// exportCommunityBuildType()//
|
||||
//
|
||||
exportThirdPartyPrice2(new_dists)//
|
||||
exportBigdataForsale(new_dists) //现在按updatetime导出
|
||||
////
|
||||
// exportThirdPartyPrice2(new_dists)//
|
||||
// exportBigdataForsale(new_dists) //现在按updatetime导出
|
||||
// exportBigdataDeal(new_dists) //2022-07-01
|
||||
|
||||
|
||||
//计算结果相关
|
||||
//
|
||||
//
|
||||
// //计算结果相关
|
||||
// exportAvmEvaluationGJNB()
|
||||
// exportAVMEvaluationItemGJNB()
|
||||
//
|
||||
////
|
||||
// exportCityPrice()
|
||||
// exportRegionPrice()
|
||||
|
||||
exportCommunityBasePrice()
|
||||
|
||||
exportCommunityPdescribeGj()
|
||||
exportCommCaseDetailGj()
|
||||
|
||||
// exportCommunityBasePrice()
|
||||
// exportCommunityBasePrice1(curMonth)
|
||||
|
||||
// exportCommunityPdescribeGj()
|
||||
// exportCommCaseDetailGj()
|
||||
|
||||
//
|
||||
// exportInOk()
|
||||
exportInOk()
|
||||
////
|
||||
// SSHHelperTest jschCommand = new SSHHelperTest();
|
||||
// System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}"));
|
||||
SSHHelperTest jschCommand = new SSHHelperTest();
|
||||
System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}"));
|
||||
}
|
||||
|
||||
def exportEvaluationRateData() {
|
||||
def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_bds_ceft,gujia_bds_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_h";
|
||||
def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_bds_ceft,gujia_bds_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 base.t0831_evaluate_rate_gj_h";
|
||||
def allRows = []
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
@@ -102,7 +105,7 @@ class ExportAllPgData {
|
||||
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,gujia_bds_ltt,gujia_bds_lgt,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_h where urbn_id='${cityCode}'";
|
||||
def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,gujia_bds_ltt,gujia_bds_lgt,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 base.t0831_bigdata_poi_gj_h where urbn_id='${cityCode}'";
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
@@ -133,7 +136,7 @@ class ExportAllPgData {
|
||||
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_bds_data_tm_val from "+database+".t0831_bigdata_district_gj_h where urbn_id='${cityCode}'";
|
||||
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_bds_data_tm_val from base.t0831_bigdata_district_gj_h where urbn_id='${cityCode}'";
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_admndiv_id
|
||||
@@ -164,7 +167,7 @@ class ExportAllPgData {
|
||||
}
|
||||
|
||||
def exportWebsiteRate(){
|
||||
def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_bds_wgt,gujia_bds_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_h";
|
||||
def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_bds_wgt,gujia_bds_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 base.t0831_website_config_gj_h";
|
||||
def allRows = []
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
@@ -194,7 +197,7 @@ class ExportAllPgData {
|
||||
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_bds_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_h where urbn_id='${cityCode}'";
|
||||
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_bds_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 base.t0831_guided_price_gj_h where urbn_id='${cityCode}'";
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
@@ -227,7 +230,7 @@ class ExportAllPgData {
|
||||
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_bds_drc_prc, gujia_bds_drc_prc_src, 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}'";
|
||||
def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_bds_drc_prc, gujia_bds_drc_prc_src, 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 base.t0831_community_guide_price_gj_h where urbn_id='${cityCode}'";
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_fsid
|
||||
@@ -307,7 +310,7 @@ class ExportAllPgData {
|
||||
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_h";
|
||||
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 base.t0831_community_staging_gj_h";
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.gujia_instm_id
|
||||
@@ -330,7 +333,7 @@ class ExportAllPgData {
|
||||
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_bds_data_tm_val from "+database+".t0831_bigdata_commbuildtype_gj_h where urbn_id='${cityCode}'";
|
||||
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_bds_data_tm_val from base.t0831_bigdata_commbuildtype_gj_h where urbn_id='${cityCode}'";
|
||||
pgsqlInstance.eachRow(sql, { r ->
|
||||
def data = []
|
||||
data << r.urbn_id
|
||||
@@ -363,12 +366,12 @@ class ExportAllPgData {
|
||||
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,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_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 " +
|
||||
def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where " +
|
||||
"urbn_id='${cityCode}' 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,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_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 " +
|
||||
def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where " +
|
||||
"urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} ";
|
||||
def rets2 = getThirdPartyDatas(sql2)
|
||||
allRows.addAll(rets2)
|
||||
@@ -424,17 +427,17 @@ class ExportAllPgData {
|
||||
if(new_dists){
|
||||
def newstr = "('"+new_dists.join("','")+"')"
|
||||
def sql1 = "select urbn_id,gujia_bds_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_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_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_bds_mkdam,gujia_bds_data_tm_val " +
|
||||
"from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}"
|
||||
"from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}"
|
||||
def rets1 = dealData(sql1)
|
||||
|
||||
def sql2 = "select urbn_id,gujia_bds_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_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_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_bds_mkdam,gujia_bds_data_tm_val " +
|
||||
"from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}"
|
||||
"from base.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,gujia_bds_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_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_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_bds_mkdam,gujia_bds_data_tm_val " +
|
||||
"from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}'";
|
||||
"from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}'";
|
||||
allRows.addAll(dealData(sql))
|
||||
}
|
||||
}
|
||||
@@ -535,7 +538,7 @@ class ExportAllPgData {
|
||||
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_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,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,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 gujia_admndiv_id not in ${newstr}";
|
||||
"from base.t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}";
|
||||
def rets1 = getHouseDatas(sql1)
|
||||
allRows.addAll(rets1)
|
||||
}else{
|
||||
@@ -560,7 +563,7 @@ class ExportAllPgData {
|
||||
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_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,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,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}"
|
||||
"from base.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);
|
||||
|
||||
+2
-2
@@ -61,8 +61,8 @@ class BigdataCitypriceBatch extends BaseBatch{
|
||||
def dealStartDate = DateUtils.addMonth(DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd"), -1)
|
||||
|
||||
def lastYearDate = DateUtils.addMonth(startDate.toString(),-12, "yyyyMMdd").toInteger();
|
||||
// cityRun(citys, startDate, endDate, cityCodeMap)
|
||||
// regionRun(citys, startDate, endDate, cityCodeMap)
|
||||
cityRun(citys, startDate, endDate, cityCodeMap)
|
||||
regionRun(citys, startDate, endDate, cityCodeMap)
|
||||
districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap)
|
||||
}
|
||||
|
||||
|
||||
+5
-2
@@ -292,12 +292,15 @@ class CommonDatautils {
|
||||
return rets;
|
||||
}
|
||||
|
||||
public static def findRemoveDistricts(def city, def cat, def fields, def m_date){
|
||||
public static def findRemoveDistricts(def city, def cat, def fields, def startDate, def endDate){
|
||||
DBObject q = new BasicDBObject();
|
||||
q.put("status", 1);
|
||||
q.put("cat", cat);
|
||||
q.put("city", city);
|
||||
q.put("m_date", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(m_date)))
|
||||
if(startDate){
|
||||
q.put("m_date", new BasicDBObject('$gte', startDate).append('$lt',endDate))
|
||||
}
|
||||
|
||||
DBObject keys = new BasicDBObject();
|
||||
if(fields){
|
||||
for(def field : fields){
|
||||
|
||||
+5
-2
@@ -97,7 +97,10 @@ class DistrictInfoExportBatch extends BaseBatch{
|
||||
saveOrUpdateFzDist(districts)
|
||||
|
||||
if(day == 15){
|
||||
def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
|
||||
def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, DateUtils.parseFromTightYYYYMMDD("2022-01-01"), endMDate);
|
||||
remarkRemoveDist(removeDists)
|
||||
}else{
|
||||
def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, startMDate, endMDate);
|
||||
remarkRemoveDist(removeDists)
|
||||
}
|
||||
def fzDistricts = null
|
||||
@@ -197,7 +200,7 @@ class DistrictInfoExportBatch extends BaseBatch{
|
||||
for(def rd : removeDists){
|
||||
def udate = new BasicDBObject()
|
||||
udate.put("status",1)
|
||||
udate.put("m_date", new Date())
|
||||
udate.put("m_date", rd.m_date)
|
||||
FZ_DIST_COLL.update(new BasicDBObject('_id',rd.get('_id')), new BasicDBObject('$set', udate));
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -141,7 +141,7 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
m << rMap.city
|
||||
m << rMap.region
|
||||
m << rMap.name
|
||||
if(curPrice){
|
||||
if(curPrice && rMap.status==0){
|
||||
m << curPrice
|
||||
}else{
|
||||
m << 0
|
||||
@@ -296,6 +296,10 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
def udata = new BasicDBObject()
|
||||
udata.put("m_date", new Date())
|
||||
udata.put("avg_price", r[5])
|
||||
|
||||
//按comm_id修改,小区名重新赋值,防止区域和小区名修改
|
||||
udata.put("region", r[3])
|
||||
udata.put("name", r[4])
|
||||
FZ_DISTRICT_STAT_COLL.update(q, new BasicDBObject('$set', udata))
|
||||
}else{
|
||||
def o = new BasicDBObject()
|
||||
|
||||
+9
-9
@@ -160,15 +160,15 @@ class DistrictSellStatBatch extends BaseBatch {
|
||||
|
||||
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)
|
||||
// }
|
||||
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)
|
||||
|
||||
@@ -520,7 +520,7 @@ class FiledStrand {
|
||||
buildStructure = "钢结构";
|
||||
}else if(val.indexOf("钢、钢筋混凝土")>-1){
|
||||
buildStructure = "钢、钢筋混凝土结构";
|
||||
}else if(val.indexOf("¸Ö½î»ìÄýÍÁ")>-1){
|
||||
}else if(val.indexOf("¸Ö½î»ìÄýÍÁ")>-1 || val.indexOf("¸Ö»ì")>-1){
|
||||
buildStructure = "钢筋混凝土结构";
|
||||
}else if(val.indexOf("混合")>-1){
|
||||
buildStructure = "混合结构";
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ class DistrictFieldAddBatch extends BaseBatch{
|
||||
"virescence_percent":"greening_rate","cubage_percent":"plot_ratio","build_area":"build_area","all_area":"land_area","household_count":"households",
|
||||
"car_site_count":"parking_cnt","car_site":"parking_cnt","property_life":"land_usage_period","address":"address","build_structure":"building_structure",
|
||||
"build_type":"build_type", "land_property":"ownership_type","live_date":"live_date",
|
||||
"loop_line_info":"loop_line"]//key:seaweed±í×Ö¶Î value:es±í×Ö¶Î
|
||||
"loop_line_info":"loop_line","loudong_count":"loudong_cnt"]//key:seaweed±í×Ö¶Î value:es±í×Ö¶Î
|
||||
|
||||
def fieldsNameMap = ["estate_charge":"物业费","block":"板块","build_date":"建筑年代","estate_company":"物业公司","developer":"开发商",
|
||||
"virescence_percent":"绿化率","cubage_percent":"容积率","build_area":"建筑面积","all_area":"占地面积","household_count":"户型",
|
||||
|
||||
@@ -15,6 +15,8 @@ public class BuildingRatioBo implements Serializable {
|
||||
private String region;
|
||||
private String district;
|
||||
private String building_name;
|
||||
private String building_avg_price;
|
||||
private String avg_price;
|
||||
private Double ratio;
|
||||
private Date c_date;
|
||||
private Date m_date;
|
||||
@@ -99,4 +101,20 @@ public class BuildingRatioBo implements Serializable {
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
|
||||
public String getBuilding_avg_price() {
|
||||
return building_avg_price;
|
||||
}
|
||||
|
||||
public void setBuilding_avg_price(String building_avg_price) {
|
||||
this.building_avg_price = building_avg_price;
|
||||
}
|
||||
|
||||
public String getAvg_price() {
|
||||
return avg_price;
|
||||
}
|
||||
|
||||
public void setAvg_price(String avg_price) {
|
||||
this.avg_price = avg_price;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 350 KiB |
Reference in New Issue
Block a user