Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+2
-2
@@ -208,7 +208,7 @@ public class HouseController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Authority(role = Role.NONE)
|
@Authority(role = Role.USER)
|
||||||
public Object similarAction(@Valid CollateralSampleQuery collateralSampleQuery){
|
public Object similarAction(@Valid CollateralSampleQuery collateralSampleQuery){
|
||||||
|
|
||||||
RestfulModelAndView mav = new RestfulModelAndView();
|
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){
|
public Object shopSimilarAction(@Valid ShopCollateralSampleQuery query){
|
||||||
RestfulModelAndView mav = new RestfulModelAndView();
|
RestfulModelAndView mav = new RestfulModelAndView();
|
||||||
ShopCollateralSampleQueryBean queryBean = new ShopCollateralSampleQueryBean();
|
ShopCollateralSampleQueryBean queryBean = new ShopCollateralSampleQueryBean();
|
||||||
|
|||||||
+1
-1
@@ -39,7 +39,7 @@ public class JnBankController {
|
|||||||
private static final Pattern STAGE_PATTERN = Pattern.compile(".*[\\w东南北中西甲乙丙丁一二三四五六七八九十百千\\d]+(期|区)$");
|
private static final Pattern STAGE_PATTERN = Pattern.compile(".*[\\w东南北中西甲乙丙丁一二三四五六七八九十百千\\d]+(期|区)$");
|
||||||
|
|
||||||
|
|
||||||
|
@Authority(role = Role.USER)
|
||||||
public Object searchAction(@Valid JNBankSearchModel model){
|
public Object searchAction(@Valid JNBankSearchModel model){
|
||||||
|
|
||||||
RestfulModelAndView mav = new RestfulModelAndView();
|
RestfulModelAndView mav = new RestfulModelAndView();
|
||||||
|
|||||||
+6
@@ -2335,6 +2335,10 @@ public class PropertyController {
|
|||||||
int total = Integer.valueOf(rankDesc[1]);
|
int total = Integer.valueOf(rankDesc[1]);
|
||||||
UniversalDto dto = new UniversalDto();
|
UniversalDto dto = new UniversalDto();
|
||||||
dto.append("relativeRank", DataUtil.roundDouble(((total - rank) / (double) total) * 100, 2));
|
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));
|
mav.setModel(BasicModel.buildOKModel().setResult(dto));
|
||||||
} else {
|
} else {
|
||||||
mav.setModel(BasicModel.buildOKModel().setMsg("暂无该小区排名信息"));
|
mav.setModel(BasicModel.buildOKModel().setMsg("暂无该小区排名信息"));
|
||||||
@@ -2343,6 +2347,8 @@ public class PropertyController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 小区成交记录查询
|
* 小区成交记录查询
|
||||||
*
|
*
|
||||||
|
|||||||
+3
-3
@@ -56,8 +56,8 @@ class BigdataCommunityBatch extends BaseBatch{
|
|||||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
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 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.findCcbDistrict(cityCodeDataMap.get(city)) //融合导数时使用
|
||||||
def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city))
|
// def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //估值导数时使用
|
||||||
def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists)
|
def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists)
|
||||||
rets = addDeleteDist(dists, ccbMaps, rets)
|
rets = addDeleteDist(dists, ccbMaps, rets)
|
||||||
rows.addAll(rets)
|
rows.addAll(rets)
|
||||||
@@ -79,7 +79,7 @@ class BigdataCommunityBatch extends BaseBatch{
|
|||||||
|
|
||||||
|
|
||||||
// delPgData()
|
// delPgData()
|
||||||
saveToPgSql(rows)
|
// saveToPgSql(rows)
|
||||||
// ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\bigdata_community.xlsx", allDatas, "数据")
|
// ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\bigdata_community.xlsx", allDatas, "数据")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user