diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 1569c7a87..baa391b24 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -197,13 +197,11 @@ public class AddrSvcController { try { //新匹配接口 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 basicModel = new BasicModel(0, "ok"); basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json)); - mav.setModel(basicModel); - }else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } + mav.setModel(basicModel); } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy index 9ed8300cc..5a38c237e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy @@ -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) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy index 24d6b09fe..3b25072f8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy @@ -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)