From 58d62ca674078e19ac71a649a468a1d5b8110d91 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Mon, 17 Jul 2023 18:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=99=E5=AD=97=E6=A5=BC=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E2=80=9C=E5=9F=8E=E5=B8=82=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E2=80=9D=E9=87=8C=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/DataController.java | 409 +++++++++++------- .../src/main/webapp/data/cityShow.ftl | 35 +- 2 files changed, 278 insertions(+), 166 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java index 3d55ac818..7628d085f 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java @@ -618,8 +618,9 @@ public class DataController { System.out.println ( "IOException." + e ); } finally { try { - if (os != null) + if(os != null) { os.close(); + } if(fos != null){ fos.close(); } @@ -840,21 +841,40 @@ public class DataController { HSSFRow onerow = s.createRow(0); int oneRowIndex = 0; - Map displayMap = getFliedDisplay(); - for(String key : outfields){ - if(cat.equals("商铺")){ - if(key.equals("bedKind")){ - continue; - } - } - String display = (String) displayMap.get(key); - if(StringUtils.isNotBlank(display)){ - onerow.createCell((short)oneRowIndex).setCellValue(display); - }else{ - onerow.createCell((short)oneRowIndex).setCellValue(key); - } - oneRowIndex ++; - } + Map displayMap = getFliedDisplay(cat); + + /* + 以displayMap为准 移除outfields中多余字段 + */ + Iterator it = outfields.iterator(); + while(it.hasNext()) { + + String key = it.next(); + + String display = (String) displayMap.get(key); + + if (StringUtils.isNotBlank(display)) { + onerow.createCell((short)oneRowIndex).setCellValue(display); + oneRowIndex ++; + }else{ + it.remove(); + } + } +//因 写字楼导出仅展示写字楼后台的字段需求 改动 +// for(String key : outfields){ +// if(cat.equals("商铺")){ +// if(key.equals("bedKind")){ +// continue; +// } +// } +// String display = (String) displayMap.get(key); +// if(StringUtils.isNotBlank(display)){ +// onerow.createCell((short)oneRowIndex).setCellValue(display); +// }else{ +// onerow.createCell((short)oneRowIndex).setCellValue(key); +// } +// oneRowIndex ++; +// } for(Map map : list){ HSSFRow row = s.createRow(s.getPhysicalNumberOfRows()); @@ -891,151 +911,236 @@ public class DataController { return wb; } - public Map getFliedDisplay(){ + public Map getFliedDisplay(String cat){ Map map = new HashMap(){ { put( "province" , "省份" ); put( "city" , "城市" ); put( "cityLevel" , "城市等级" ); put( "rankingLevel" , "行政区划" ); - put( "existingDistrictCount" , "小区数量" ); - put( "districtsHasLoudong" , "有楼栋的小区数量" ); - put( "districtsHasFanghao" , "有房号的小区数量" ); - put( "existingOfficeCount" , "写字楼数量" ); - put( "existingShopCount" , "商铺数量" ); - put( "priceCoverage" , "价格覆盖率" ); - put( "priceCreditGte80Coverage", "0.8≤价格可信度"); - put( "priceCreditGte66Coverage", "0.66≤价格可信度<0.8"); - put( "priceCreditGte60Coverage", "0.6≤价格可信度<0.66"); - put( "priceCreditGte00Coverage", "价格可信度<0.6"); - put( "name" , "名称" ); - put( "region" , "区域" ); - put( "block" , "板块" ); - put( "address" , "地址" ); - put( "estateType" , "物业类型" ); - put( "householdCount" , "户数" ); - put( "openDate" , "开盘时间" ); - put( "latLng" , "mapabc经纬度" ); - put( "latLng2" , "百度经纬度" ); - put( "allArea" , "占地面积" ); - put( "buildArea" , "建筑面积" ); - put( "buildType" , "建筑类型" ); - put( "developer" , "开发商" ); - put( "estateCompany" , "物业公司" ); - put( "cubagePercent" , "容积率" ); - put( "virescencePercent" , "绿化率" ); - put( "carSite" , "停车位" ); - put( "carSiteCount" , "停车位描述" ); - put( "estateCharge" , "物业费" ); - put( "floorplanPics" , "楼层平面图" ); - put( "outPics" , "外景图" ); - put( "rentPrice" , "租金" ); - put( "bedKind" , "写字楼等级" ); - put( "houseFloor" , "楼层" ); - put( "houseHeight" , "楼高" ); - put( "houseArea" , "面积" ); - put( "room" , "室" ); - put( "hall" , "厅" ); - put( "direction" , "朝向" ); - put( "toilet" , "卫" ); - put( "noise" , "噪音" ); - put( "fitmentRank" , "装修" ); - put( "fitmentAge" , "装修年限" ); - put( "leaseTerm","租赁年限"); - put( "paymentPattern","付款方式"); - put( "rentPrice","出租价格"); - put( "sellPrice","出售价格"); - put( "mobile","电话"); - put( "floor","建筑楼层"); - put( "floorInfo","楼层状况"); - put( "bayArea","开间面积"); - put( "finishBuildingDate","竣工时间"); - put( "liveDate","开业时间"); - put( "divisible","是否可分割"); - put( "unifiedManage","是否统一管理"); - put( "metroInfo","地铁沿线"); - put( "metroNames","地铁站名"); - put( "facilities","配套设施"); - put( "propertyInfo","物业概况"); - put( "traffic","交通情况"); - put( "surrounding","周边情况"); - put( "businessStatus","经营业态"); - put( "rentType","租售类型"); - put( "price","价格"); - put( "businessQuarter","商圈"); - put( "startBuildingDate","开工时间"); - put( "liveDate","交房时间"); - put( "loopLineInfo","环线"); - put( "propertyLife","产权年限"); - put( "houseProperty","产权性质"); - put( "licence","预售许可证"); - put( "buildStructure","建筑结构"); - put( "house_count","房号总量"); - put( "exists_house_dis_count","有房号的小区数量"); - put( "house_num_rate","楼号覆盖率"); - put( "unit_num_rate","单元覆盖率"); - put( "room_num_rate","室号覆盖率"); - put( "area_rate","面积覆盖率"); - put( "room_info_rate","户型覆盖率"); - put( "hourse_structure_rate","户型结构覆盖率"); - put( "actualFloor","实际层覆盖率"); - put( "nominalFloor","名义层覆盖率"); - put( "build_type","建筑类型覆盖率"); - put( "loudong_count","楼栋总量"); - put( "exists_loudong_dis_count","有楼栋的小区数量"); - put( "loudong_num_rate","楼栋号覆盖率"); - put( "loudong_height_rate","总楼层覆盖率"); - put( "elevatornumber_rate","电梯数覆盖率"); - put( "households_rate","户数覆盖率"); - put( "address_rate","地址覆盖率"); - put( "structure_rate","建筑结构覆盖率"); - put( "build_year_rate","建筑年代覆盖率"); - put( "usage_rate","楼栋用途覆盖率"); - put( "loudong_type_rate","楼栋类型覆盖率"); - put( "floor_type_reate","建筑类型(按楼层)覆盖率"); - put( "archiNature_rate","建筑性质覆盖率"); - put( "totalAreas_rate","建筑总面积覆盖率"); - put("streetCommunity","街道社区"); - put("committee","居委会"); - put("schools","对口学校"); - put("houseStructure","房屋结构"); - put("estateType2","物业类型"); - put("buildDate","建筑年代"); - put("alias","别名"); - put("addrAlias","地址别名"); - put("mainTypeArea","主力面积"); - put("loudongCount","楼栋数"); - put("township","乡镇街道"); - put("schools","对口小学"); - put("kindergartens","对口幼儿园"); - put("elevator","电梯"); - put("landProperty","权属类别"); - put("usageCard","土地使用权证号"); - put("landUsageStart","土地使用年限"); - put("occupancyRate","入住率"); - put("mainType","主力户型"); - put("mappingAlias","映射别名"); - put("districtAliasTotalCount", "别名总量"); + put( "latLng" , "mapabc经纬度" ); + put( "latLng2" , "百度经纬度" ); - put("undergroundCarSite", "地下车位数"); - put("landCarSite", "地上车位数"); - put("parkingFee", "车位月租金"); - put("sight", "开间面积"); - put("lobbyHeight", "大堂层高"); - put("standardHeight", "标准层高"); - put("clearHeight", "净高"); - put("standardArea", "标准层面积"); - put("foreign", "是否涉外"); - put("register", "是否可注册"); - put("divisible", "是否可分割"); - put("elevatorsCount","电梯数量"); - put("personElevatorsCount","客梯数"); - put("goodsElevatorCount","货梯数"); - put("realUsePercent","得房率"); - put("landFloor","地上层数"); - put("undergroundFloor","地下层数"); +// put( "floorplanPics" , "楼层平面图" ); +// put( "outPics" , "外景图" ); +// put( "rentPrice" , "租金" ); +// put( "houseFloor" , "楼层" ); +// put( "houseHeight" , "楼高" ); +// put( "houseArea" , "面积" ); +// put( "room" , "室" ); +// put( "hall" , "厅" ); +// put( "direction" , "朝向" ); +// put( "toilet" , "卫" ); +// put( "noise" , "噪音" ); +// put( "fitmentRank" , "装修" ); +// put( "fitmentAge" , "装修年限" ); +// put( "leaseTerm","租赁年限"); +// put( "paymentPattern","付款方式"); +// put( "sellPrice","出售价格"); +// put( "mobile","电话"); +// put( "liveDate","开业时间"); +// put( "divisible","是否可分割"); +// put( "unifiedManage","是否统一管理"); +// put( "metroInfo","地铁沿线"); +// put( "metroNames","地铁站名"); +// put( "facilities","配套设施"); +// put( "propertyInfo","物业概况"); +// put( "traffic","交通情况"); +// put( "surrounding","周边情况"); +// put( "rentType","租售类型"); +// put( "price","价格"); +// put("schools","对口学校"); +// put("estateType" , "物业类型" ); +// put("estateType2","物业类型"); +// put("buildDate","建筑年代"); } };// + + if(cat.equals("小区")){ + map = setDistrictFields(map); + }else if(cat.equals("写字楼")){ + map = setOfficeFields(map); + }else if(cat.equals("房号")){ + map = setRoomNumberFields(map); + }else if(cat.equals("商铺")){ + map = setShopsFields(map); + }else if(cat.equals("楼栋")){ + map = setBuildingFields(map); + } + return map; } + private Map setDistrictFields (Map map){ + map.put( "existingDistrictCount" , "小区数量" ); + map.put( "districtsHasLoudong" , "有楼栋的小区数量" ); + map.put( "districtsHasFanghao" , "有房号的小区数量" ); + map.put( "priceCoverage" , "价格覆盖率" ); + map.put("districtAliasTotalCount", "别名总量"); + map.put( "priceCreditGte80Coverage", "0.8≤价格可信度"); + map.put( "priceCreditGte66Coverage", "0.66≤价格可信度<0.8"); + map.put( "priceCreditGte60Coverage", "0.6≤价格可信度<0.66"); + map.put( "priceCreditGte00Coverage", "价格可信度<0.6"); + map.put( "businessQuarter","商圈"); + map.put( "startBuildingDate","开工时间"); + map.put( "liveDate","交房时间"); + map.put( "loopLineInfo","环线"); + map.put( "propertyLife","产权年限"); + map.put( "houseProperty","产权性质"); + map.put( "licence","预售许可证"); + map.put( "buildStructure","建筑结构"); + map.put( "name" , "名称" ); + map.put( "region" , "区域" ); + map.put( "block" , "板块" ); + map.put( "address" , "地址" ); + map.put( "estateType2" , "物业类型" ); + map.put( "householdCount" , "户数" ); + map.put( "openDate" , "开盘时间" ); + map.put("buildDate","建筑年代"); + map.put( "allArea" , "占地面积" ); + map.put( "buildArea" , "建筑面积" ); + map.put( "buildType" , "建筑类型" ); + map.put( "developer" , "开发商" ); + map.put( "estateCompany" , "物业公司" ); + map.put( "cubagePercent" , "容积率" ); + map.put( "virescencePercent" , "绿化率" ); + map.put( "carSite" , "停车位" ); + map.put( "estateCharge" , "物业费" ); + map.put( "finishBuildingDate","竣工时间"); + map.put("streetCommunity","街道社区"); + map.put("committee","居委会"); + map.put("schools","对口小学"); + map.put("houseStructure","房屋结构"); + map.put("alias","别名"); + map.put("addrAlias","地址别名"); + map.put("mainTypeArea","主力面积"); + map.put("loudongCount","楼栋数"); + map.put( "carSiteCount" , "停车位描述" ); + map.put("mappingAlias","映射别名"); + map.put("elevator","电梯"); + map.put("township","乡镇街道"); + map.put("kindergartens","对口幼儿园"); + map.put("mainType","主力户型"); + map.put("landProperty","权属类别"); + map.put("usageCard","土地使用权证号"); + map.put("occupancyRate","入住率"); + map.put("landUsageStart","土地使用年限"); + map.put( "rentPrice","出租价格"); + map.put("realUsePercent","得房率"); + return map; + } + private Map setOfficeFields (Map map){ + map.put( "existingOfficeCount" , "写字楼数量" ); + map.put( "name" , "名称" ); + map.put( "region" , "区域" ); + map.put( "block" , "板块" ); + map.put( "address" , "地址" ); +// map.put( "estateType2" , "物业类型" ); +// map.put( "openDate" , "开盘时间" ); +// map.put( "liveDate","交房时间"); + map.put( "allArea" , "占地面积" ); + map.put( "buildArea" , "建筑面积" ); +// map.put( "buildType" , "建筑类型" ); + map.put( "developer" , "开发商" ); + map.put( "estateCompany" , "物业公司" ); + map.put( "cubagePercent" , "容积率" ); + map.put( "virescencePercent" , "绿化率" ); + map.put( "carSite" , "停车位" ); + map.put( "estateCharge" , "物业费" ); + map.put( "finishBuildingDate","竣工时间"); +// map.put( "startBuildingDate","开工时间"); +// map.put( "carSiteCount" , "停车位描述" ); + map.put( "bedKind" , "写字楼等级" ); + map.put("alias","别名"); + map.put("addrAlias","地址别名"); +// map.put( "businessQuarter","商圈"); + map.put( "loopLineInfo","环线"); +// map.put( "floorInfo","楼层状况"); + map.put("undergroundCarSite", "地下车位数"); + map.put("landCarSite", "地上车位数"); + map.put("parkingFee", "车位月租金"); + map.put( "bayArea","开间面积"); + map.put( "propertyLife","产权年限"); + map.put("elevatorsCount","电梯数量"); + map.put("personElevatorsCount","客梯数"); + map.put("goodsElevatorCount","货梯数"); + map.put("standardHeight", "标准层高"); + map.put("clearHeight", "净高"); + map.put("standardArea", "标准层面积"); + map.put("foreign", "是否涉外"); + map.put("register", "是否可注册"); + map.put("lobbyHeight", "大堂层高"); +// map.put("township","乡镇街道"); + map.put("divisible", "是否可分割"); + map.put("landFloor","地上层数"); + map.put("undergroundFloor","地下层数"); + + return map; + } + + private Map setRoomNumberFields (Map map){ + map.put( "house_count","房号总量"); + map.put( "exists_house_dis_count","有房号的小区数量"); + map.put( "house_num_rate","楼号覆盖率"); + map.put( "unit_num_rate","单元覆盖率"); + map.put( "room_num_rate","室号覆盖率"); + map.put( "area_rate","面积覆盖率"); + map.put( "room_info_rate","户型覆盖率"); + map.put( "hourse_structure_rate","户型结构覆盖率"); + map.put( "actualFloor","实际层覆盖率"); + map.put( "nominalFloor","名义层覆盖率"); + map.put( "build_type","建筑类型覆盖率"); + return map; + } + + private Map setShopsFields (Map map){ + map.put( "existingShopCount" , "商铺数量" ); + map.put( "name" , "名称" ); + map.put( "region" , "区域" ); + map.put( "block" , "板块" ); + map.put( "address" , "地址" ); + map.put("alias","别名"); + map.put("addrAlias","地址别名"); + map.put( "estateType2" , "物业类型" ); + map.put( "openDate" , "开盘时间" ); + map.put( "liveDate","交房时间"); + map.put( "allArea" , "占地面积" ); + map.put( "buildArea" , "建筑面积" ); + map.put( "buildType" , "建筑类型" ); + map.put( "developer" , "开发商" ); + map.put( "estateCompany" , "物业公司" ); + map.put( "carSite" , "停车位" ); + map.put( "estateCharge" , "物业费" ); + map.put( "floor","建筑楼层"); + map.put( "finishBuildingDate","竣工时间"); + map.put( "businessQuarter","商圈"); + map.put( "startBuildingDate","开工时间"); + map.put("sight", "开间面积"); + map.put( "propertyLife","产权年限"); + map.put( "businessStatus","经营业态"); + map.put("parkingFee", "车位月租金"); + map.put("township","乡镇街道"); + map.put( "loopLineInfo","环线"); + map.put("landFloor","地上层数"); + map.put("undergroundFloor","地下层数"); + return map; + } + private Map setBuildingFields (Map map){ + map.put( "loudong_count","楼栋总量"); + map.put( "exists_loudong_dis_count","有楼栋的小区数量"); + map.put( "unit_num_rate","单元覆盖率"); + map.put( "loudong_num_rate","楼栋号覆盖率"); + map.put( "loudong_height_rate","总楼层覆盖率"); + map.put( "elevatornumber_rate","电梯数覆盖率"); + map.put( "households_rate","户数覆盖率"); + map.put( "address_rate","地址覆盖率"); + map.put( "structure_rate","建筑结构覆盖率"); + map.put( "build_year_rate","建筑年代覆盖率"); + map.put( "usage_rate","楼栋用途覆盖率"); + map.put( "loudong_type_rate","楼栋类型覆盖率"); + map.put( "floor_type_reate","建筑类型(按楼层)覆盖率"); + map.put( "archiNature_rate","建筑性质覆盖率"); + map.put( "totalAreas_rate","建筑总面积覆盖率"); + return map; + } + public Object houseAction(DataModel model) { if (StringUtils.isBlank(model.getCityDisplay())) { diff --git a/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl b/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl index b46fd9431..f625ee581 100644 --- a/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl @@ -196,49 +196,55 @@ 绛夌骇 <#if officeDetail.bedKind??>${officeDetail.bedKind * 100}%<#else>鏈煡 - 寤虹瓚绫诲瀷 + <#--寤虹瓚绫诲瀷 <#if officeDetail.buildType??>${officeDetail.buildType * 100}%<#else>鏈煡 + --> 缁忕含搴�-mapabc <#if officeDetail.latLng??>${officeDetail.latLng * 100}%<#else>鏈煡 缁忕含搴�-鐧惧害 <#if officeDetail.latLng2??>${officeDetail.latLng2 * 100}%<#else>鏈煡 - - + 寮�鍙戝晢 + <#if officeDetail.developer??>${officeDetail.developer * 100}%<#else>鏈煡 寤虹瓚闈㈢Н <#if officeDetail.buildArea??>${officeDetail.buildArea * 100}%<#else>鏈煡 鍗犲湴闈㈢Н <#if officeDetail.allArea??>${officeDetail.allArea * 100}%<#else>鏈煡 - 鍏ヤ綇鏃堕棿 + <#--鍏ヤ綇鏃堕棿 <#if officeDetail.liveDate??>${officeDetail.liveDate * 100}%<#else>鏈煡 澶栨櫙鍥� <#if officeDetail.outPics??>${officeDetail.outPics * 100}%<#else>鏈煡 + --> + 瀹圭Н鐜� + <#if officeDetail.cubagePercent??>${officeDetail.cubagePercent * 100}%<#else>鏈煡 + 缁垮寲鐜� + <#if officeDetail.virescencePercent??>${officeDetail.virescencePercent * 100}%<#else>鏈煡 - 寮�鍙戝晢 - <#if officeDetail.developer??>${officeDetail.developer * 100}%<#else>鏈煡 鐗╀笟鍏徃 <#if officeDetail.estateCompany??>${officeDetail.estateCompany * 100}%<#else>鏈煡 - 瀹圭Н鐜� - <#if officeDetail.cubagePercent??>${officeDetail.cubagePercent * 100}%<#else>鏈煡 - 缁垮寲鐜� - <#if officeDetail.virescencePercent??>${officeDetail.virescencePercent * 100}%<#else>鏈煡 + 鐗╀笟璐� + <#if officeDetail.estateCharge??>${officeDetail.estateCharge * 100}%<#else>鏈煡 +   +   +   +   - 鐗╀笟璐� - <#if officeDetail.estateCharge??>${officeDetail.estateCharge * 100}%<#else>鏈煡 - 鐗╀笟绫诲瀷 + + <#--鐗╀笟绫诲瀷 <#if officeDetail.estateType2??>${officeDetail.estateType2 * 100}%<#else>鏈煡 鍛ㄨ竟閰嶅 <#if officeDetail.facilities??>${officeDetail.facilities * 100}%<#else>鏈煡 椤圭洰鐗硅壊 <#if officeDetail.characteristic??>${officeDetail.characteristic * 100}%<#else>鏈煡 + --> - 鍧囦环 + <#--鍧囦环 <#if officeDetail.price??>${officeDetail.price * 100}%<#else>鏈煡 绉熼噾 <#if officeDetail.rentPrice??>${officeDetail.rentPrice * 100}%<#else>鏈煡 @@ -246,6 +252,7 @@       + -->