From 1b12bc12f627468b6d8c3ee1dde2098b76726e6f Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Mon, 7 Aug 2023 16:47:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddrSvcController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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("服务升级中...")); From 2d2fef44ba9b9757201c3c3fcec2214cd29e4660 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Mon, 7 Aug 2023 17:00:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/AddrSvcController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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("服务升级中...")); From 7f664dfefa22b22fc617a5fc44fe044c1f4aa144 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 Aug 2023 13:52:33 +0800 Subject: [PATCH 3/3] update --- .../ronghe/BigdataCitypriceBatch.groovy | 4 ++-- .../script/fuzhou/DistrictSellStatBatch.groovy | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) 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)