From f91c4b04cedd1a1ceb248f77d58dc3b718c1a514 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 23 Mar 2023 13:30:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/PropertyController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 7ce383214..2b86ea7e3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2335,6 +2335,10 @@ public class PropertyController { int total = Integer.valueOf(rankDesc[1]); UniversalDto dto = new UniversalDto(); dto.append("relativeRank", DataUtil.roundDouble(((total - rank) / (double) total) * 100, 2)); + + if(null != districtAnalyData.getRegionRank()){ + dto.append("regionRelativeRank", DataUtil.roundDouble(((districtAnalyData.getRegionRankTotal() - districtAnalyData.getRegionRank()) / (double) districtAnalyData.getRegionRankTotal()) * 100, 2)); + } mav.setModel(BasicModel.buildOKModel().setResult(dto)); } else { mav.setModel(BasicModel.buildOKModel().setMsg("暂无该小区排名信息")); @@ -2343,6 +2347,8 @@ public class PropertyController { } + + /** * 小区成交记录查询 * From 7f559e1e74aa96a0396d4c21a8e783ce8334f1cc Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 23 Mar 2023 16:47:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B1=9F=E5=8D=97=E8=A1=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fangjia/open/controllers/HouseController.java | 4 ++-- .../java/com/fangjia/open/controllers/JnBankController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index 5f2fddf88..1efa12d0f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -208,7 +208,7 @@ public class HouseController { } - @Authority(role = Role.NONE) + @Authority(role = Role.USER) public Object similarAction(@Valid CollateralSampleQuery collateralSampleQuery){ RestfulModelAndView mav = new RestfulModelAndView(); @@ -253,7 +253,7 @@ public class HouseController { /**商铺相似房源接口*/ - @Authority(role = Role.NONE) + @Authority(role = Role.USER) public Object shopSimilarAction(@Valid ShopCollateralSampleQuery query){ RestfulModelAndView mav = new RestfulModelAndView(); ShopCollateralSampleQueryBean queryBean = new ShopCollateralSampleQueryBean(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java index 46d2a41cd..2c7a22187 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/JnBankController.java @@ -39,7 +39,7 @@ public class JnBankController { private static final Pattern STAGE_PATTERN = Pattern.compile(".*[\\w东南北中西甲乙丙丁一二三四五六七八九十百千\\d]+(期|区)$"); - + @Authority(role = Role.USER) public Object searchAction(@Valid JNBankSearchModel model){ RestfulModelAndView mav = new RestfulModelAndView(); From 41f31ca83ee3b4a5f6370f19bea3fe3806af0aee Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 24 Mar 2023 19:17:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=BB=BA=E8=A1=8C=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E4=BF=AE=E6=94=B9=20=20=E4=B8=8D=E5=AD=98pg?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy index fcef31e5d..04b12eaa2 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy @@ -79,7 +79,7 @@ class BigdataCommunityBatch extends BaseBatch{ // delPgData() - saveToPgSql(rows) +// saveToPgSql(rows) // ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\bigdata_community.xlsx", allDatas, "数据") } From 2584f64f4c543f32d5b6ea7eb0fedd24471f0a3d Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 24 Mar 2023 19:55:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=AF=BC=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy index 04b12eaa2..cd0d1a45b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy @@ -56,8 +56,8 @@ class BigdataCommunityBatch extends BaseBatch{ 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","street","street_number"]) -// def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) - def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) + def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //融合导数时使用 +// def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //估值导数时使用 def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) rets = addDeleteDist(dists, ccbMaps, rets) rows.addAll(rets) From 3e4ba575031803f9798b93510c9bbec23ef016ed Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 24 Mar 2023 20:22:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=9E=8D=E5=90=88=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=B7=91=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ronghe/ExportDistrictRongHe.groovy | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index eb5464e4d..0ac091dea 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -45,7 +45,7 @@ class ExportDistrictRongHe extends BaseBatch{ // exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) - if(curDate.toString().endsWith("10")){ +// if(curDate.toString().endsWith("10")){ exportBigdataCommunityGJRH()// exportBigdataBuildingFJW()// exportBigdataCommfeeGj()// @@ -62,31 +62,31 @@ class ExportDistrictRongHe extends BaseBatch{ exportBigdataCommlayoutpicFjw() exportEvaluateRate() - exportBigdataCityPrice(queryDate) - exportBigdataDistPrice(queryDate) - exportBigdataCommPrice(queryDate) - - //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供 - def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM")); -// exportThirdPartyPrice2(thirdPartyMonth, new_dists) - exportPgThirdPartyPrice2(thirdPartyMonth, new_dists) - - //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 -// exportCommunityBasePrice(lastMonth) -// exportCommunityPdescribeGj(lastMonth) -// exportGuideStatistics(lastMonth) -// exportBigdataSupplierStatistics(lastMonth) -// exportBigdataModelingBase(lastMonth) - - exportPgCommunityBasePrice(lastMonth) - exportPgCommunityPdescribeGj(lastMonth) - exportPgGuideStatistics(lastMonth) - exportPgBigdataSupplierStatistics(lastMonth) - exportPgBigdataModelingBase(lastMonth) - - //2月8号 临时导出苏州一年的数据 - exportPgBigdataForsale("2023-01-01",DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出 - } +// exportBigdataCityPrice(queryDate) +// exportBigdataDistPrice(queryDate) +// exportBigdataCommPrice(queryDate) +// +// //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供 +// def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM")); +//// exportThirdPartyPrice2(thirdPartyMonth, new_dists) +// exportPgThirdPartyPrice2(thirdPartyMonth, new_dists) +// +// //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 +//// exportCommunityBasePrice(lastMonth) +//// exportCommunityPdescribeGj(lastMonth) +//// exportGuideStatistics(lastMonth) +//// exportBigdataSupplierStatistics(lastMonth) +//// exportBigdataModelingBase(lastMonth) +// +// exportPgCommunityBasePrice(lastMonth) +// exportPgCommunityPdescribeGj(lastMonth) +// exportPgGuideStatistics(lastMonth) +// exportPgBigdataSupplierStatistics(lastMonth) +// exportPgBigdataModelingBase(lastMonth) +// +// //2月8号 临时导出苏州一年的数据 +// exportPgBigdataForsale("2023-01-01",DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出 +// } SSHHelper jschCommand = new SSHHelper(); System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); From 2cf1920b1a4aa2d206f205c4cc4cd7ec4cd09f86 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 24 Mar 2023 21:29:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8F=AA=E5=AF=BC=E5=88=AB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ronghe/ExportDistrictRongHe.groovy | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index 0ac091dea..dfd27e69d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -43,24 +43,24 @@ class ExportDistrictRongHe extends BaseBatch{ //按天导(每天一个文件夹) // exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) - exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) - -// if(curDate.toString().endsWith("10")){ - exportBigdataCommunityGJRH()// - exportBigdataBuildingFJW()// - exportBigdataCommfeeGj()// - - exportBigdataCommbuildstruGJ()// - exportBigdataCommhousetypeGJ()// - exportBigdataCommbuildyearGj()// - exportBigdataCommhouseuseGJ()// - exportBigdataPositionGJ()// - exportBigdataDistrictFJW()// +// exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) +// +//// if(curDate.toString().endsWith("10")){ +// exportBigdataCommunityGJRH()// +// exportBigdataBuildingFJW()// +// exportBigdataCommfeeGj()// +// +// exportBigdataCommbuildstruGJ()// +// exportBigdataCommhousetypeGJ()// +// exportBigdataCommbuildyearGj()// +// exportBigdataCommhouseuseGJ()// +// exportBigdataPositionGJ()// +// exportBigdataDistrictFJW()// exportBigdataAliasFJW()// - exportBigdataBuildprojFjw() - exportBigdataCommlayoutpicFjw() - exportEvaluateRate() +// exportBigdataBuildprojFjw() +// exportBigdataCommlayoutpicFjw() +// exportEvaluateRate() // exportBigdataCityPrice(queryDate) // exportBigdataDistPrice(queryDate) From 099eeed7f8ac76c805e2d3db60fe0cf28cbe508b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 27 Mar 2023 10:44:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ronghe/ExportDistrictRongHe.groovy | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index dfd27e69d..eb5464e4d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -43,50 +43,50 @@ class ExportDistrictRongHe extends BaseBatch{ //按天导(每天一个文件夹) // exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) -// exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) -// -//// if(curDate.toString().endsWith("10")){ -// exportBigdataCommunityGJRH()// -// exportBigdataBuildingFJW()// -// exportBigdataCommfeeGj()// -// -// exportBigdataCommbuildstruGJ()// -// exportBigdataCommhousetypeGJ()// -// exportBigdataCommbuildyearGj()// -// exportBigdataCommhouseuseGJ()// -// exportBigdataPositionGJ()// -// exportBigdataDistrictFJW()// + exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) + + if(curDate.toString().endsWith("10")){ + exportBigdataCommunityGJRH()// + exportBigdataBuildingFJW()// + exportBigdataCommfeeGj()// + + exportBigdataCommbuildstruGJ()// + exportBigdataCommhousetypeGJ()// + exportBigdataCommbuildyearGj()// + exportBigdataCommhouseuseGJ()// + exportBigdataPositionGJ()// + exportBigdataDistrictFJW()// exportBigdataAliasFJW()// -// exportBigdataBuildprojFjw() -// exportBigdataCommlayoutpicFjw() -// exportEvaluateRate() + exportBigdataBuildprojFjw() + exportBigdataCommlayoutpicFjw() + exportEvaluateRate() -// exportBigdataCityPrice(queryDate) -// exportBigdataDistPrice(queryDate) -// exportBigdataCommPrice(queryDate) -// -// //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供 -// def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM")); -//// exportThirdPartyPrice2(thirdPartyMonth, new_dists) -// exportPgThirdPartyPrice2(thirdPartyMonth, new_dists) -// -// //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 -//// exportCommunityBasePrice(lastMonth) -//// exportCommunityPdescribeGj(lastMonth) -//// exportGuideStatistics(lastMonth) -//// exportBigdataSupplierStatistics(lastMonth) -//// exportBigdataModelingBase(lastMonth) -// -// exportPgCommunityBasePrice(lastMonth) -// exportPgCommunityPdescribeGj(lastMonth) -// exportPgGuideStatistics(lastMonth) -// exportPgBigdataSupplierStatistics(lastMonth) -// exportPgBigdataModelingBase(lastMonth) -// -// //2月8号 临时导出苏州一年的数据 -// exportPgBigdataForsale("2023-01-01",DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出 -// } + exportBigdataCityPrice(queryDate) + exportBigdataDistPrice(queryDate) + exportBigdataCommPrice(queryDate) + + //因为融合暂不切库,所以需要加传一张第三方均价表到融合中, 从1月10日开始传输,长期供 + def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM")); +// exportThirdPartyPrice2(thirdPartyMonth, new_dists) + exportPgThirdPartyPrice2(thirdPartyMonth, new_dists) + + //1月10日 新增5张表,导92城,增量数据,2月10日导344城,其中252城所有历史数据,92城增量,3月后可能不用提供数据 +// exportCommunityBasePrice(lastMonth) +// exportCommunityPdescribeGj(lastMonth) +// exportGuideStatistics(lastMonth) +// exportBigdataSupplierStatistics(lastMonth) +// exportBigdataModelingBase(lastMonth) + + exportPgCommunityBasePrice(lastMonth) + exportPgCommunityPdescribeGj(lastMonth) + exportPgGuideStatistics(lastMonth) + exportPgBigdataSupplierStatistics(lastMonth) + exportPgBigdataModelingBase(lastMonth) + + //2月8号 临时导出苏州一年的数据 + exportPgBigdataForsale("2023-01-01",DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//融合按发布时间导,估值按updatetime导出 + } SSHHelper jschCommand = new SSHHelper(); System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}"));