diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 7c782d610..7df83ddd3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -102,6 +102,7 @@ public class ApiUserController { bo.setPurpose(apiUser.getPurpose()); bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); apiUserBoList.add(bo); } @@ -183,6 +184,7 @@ public class ApiUserController { apiUser.setModificationDate(date); apiUser.setDeadTime(model.getDeadTime()); apiUser.setManager(model.getManager()); + apiUser.setIsMonitor(model.getIsMonitor()); this.apiUserService.save(apiUser); if(model.getEvaluateRate() != null && model.getEvaluateRate() != 0){ ApiUserCfg apiUserCfg = new ApiUserCfg(); @@ -222,6 +224,7 @@ public class ApiUserController { bo.setEmail(apiUser.getEmail()); bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); if(apiUserCfg_rate != null){ bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); @@ -272,6 +275,7 @@ public class ApiUserController { dataApiUser.put("purpose", model.getPurpose()); dataApiUser.put("deadTime", model.getDeadTime()); dataApiUser.put("manager", model.getManager()); + dataApiUser.put("isMonitor", model.getIsMonitor()); this.apiUserService.update(dataApiUser, userId); //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java index 022176f79..9e99dd400 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java @@ -602,6 +602,18 @@ public class AvgPriceUpdateController { calcCommandService.save(cmds); json.put("msg", "任务保存成功,共保存" + cmds.size() + "条任务"); + + //均价修改,让小区也修改,为了福州可以识别被修改小区 + if(commands.size()>0){ + for (int i = 0, len = commands.size(); i < len; i++) { + JSONObject command = (JSONObject) commands.get(i); + if(command.containsKey("id")){ + Map udata = new HashMap(); + udata.put("modificationDate", new Date()); + districtService.updateById(udata, command.getString("id")); + } + } + } return model; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java new file mode 100644 index 000000000..159155d1c --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java @@ -0,0 +1,175 @@ +package com.fangjia.bkoff.controllers; + +import com.fangjia.bkoff.model.ApiUserModel; +import com.fangjia.bkoff.model.BuildingRatioModel; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; +import com.fangjia.dal.sql.model.User; +import com.fangjia.service.bo.BuildingRatioBo; +import com.fangjia.service.mongo.bkoff.BuildingRatioService; +import org.apache.commons.lang.StringUtils; + +import java.net.URLEncoder; +import java.util.*; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioController { + + private BuildingRatioService buildingRatioService; + + /** + * 新建楼栋系数信息 + * + * @param model + * @return + */ + public Object doAddAction(BuildingRatioModel model) throws Exception { + try { + if(checkBuildingNameAction(model)){ + model.redirect("/buildingRatio/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); + return model; + } + Date date = new Date(); + BuildingRatio buildingRatio = new BuildingRatio(); + buildingRatio.setCity(model.getCity_name()); + buildingRatio.setRegion(model.getRegion()); + buildingRatio.setDistrict(model.getDistrict()); + buildingRatio.setBuilding_name(model.getBuilding_name()); + buildingRatio.setRatio(model.getRatio()); + buildingRatio.setC_date(date); + buildingRatio.setM_date(date); + buildingRatio.setCreate_user(model.getCreate_user()); + buildingRatio.setNote(model.getNote()); + buildingRatio.setBuilding_avg_price(model.getBuilding_avg_price()); + buildingRatio.setAvg_price(model.getAvg_price()); + this.buildingRatioService.save(buildingRatio); + + model.setMsg("新建成功!"); + } catch (Exception e) { + e.printStackTrace(); + model.setMsg("新建失败!"); + } + model.redirect("/buildingRatio/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); + return model; + } + + public Object doDeleteAction(BuildingRatioModel model){ + if(StringUtils.isNotBlank(model.getId())){ + this.buildingRatioService.deleteById(model.getId()); + } + model.setViewType("redirect"); + model.setViewParam("location","/buildingRatio/list"); + return model; + } + + /** + * 修改楼栋系数信息 + * + * @param model + * @return + */ + public Object updateAction(BuildingRatioModel model) throws Exception { + Map data_buildingRatio = new HashMap(); + + data_buildingRatio.put("id", model.getId()); + data_buildingRatio.put("city", model.getCity_name()); + data_buildingRatio.put("region", model.getRegion()); + data_buildingRatio.put("district", model.getDistrict()); + data_buildingRatio.put("building_name", model.getBuilding_name()); + data_buildingRatio.put("building_avg_price", model.getBuilding_avg_price()); + data_buildingRatio.put("avg_price", model.getAvg_price()); + data_buildingRatio.put("ratio", model.getRatio()); + data_buildingRatio.put("m_date", new Date()); + data_buildingRatio.put("create_user", model.getCreate_user()); + data_buildingRatio.put("note", model.getNote()); + + this.buildingRatioService.saveOrUpdateByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name(), data_buildingRatio); + + model.setViewType("redirect"); + model.setViewParam("location", "/buildingRatio/list"); + + return model; + } + + public Object listAction(BuildingRatioModel model) { + + List buildingRatioList = this.buildingRatioService.findAllByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name()); + + List buildingRatioBoList = new ArrayList(); + + for (BuildingRatio buildingRatio : buildingRatioList) { + BuildingRatioBo bo = new BuildingRatioBo(); + + bo.setId(buildingRatio.getId()); + bo.setCity_name(buildingRatio.getCity()); + bo.setRegion(buildingRatio.getRegion()); + bo.setDistrict(buildingRatio.getDistrict()); + bo.setBuilding_name(buildingRatio.getBuilding_name()); + bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price()); + bo.setAvg_price(buildingRatio.getAvg_price()); + bo.setRatio(buildingRatio.getRatio()); + bo.setC_date(buildingRatio.getC_date()); + bo.setM_date(buildingRatio.getM_date()); + bo.setCreate_user(buildingRatio.getCreate_user()); + bo.setNote(buildingRatio.getNote()); + + buildingRatioBoList.add(bo); + } + + model.setBuildingRatioBoList(buildingRatioBoList); + return model; + } + + public Object addAction(BuildingRatioModel model) { + return model; + } + + /** + * 编辑api用户信息 + * + * @param model + * @return + */ + public Object editAction(BuildingRatioModel model) { + BuildingRatio buildingRatio = this.buildingRatioService.findBuildingRatioById(model.getId()); + + BuildingRatioBo bo = new BuildingRatioBo(); + bo.setId(buildingRatio.getId()); + bo.setCity_name(buildingRatio.getCity()); + bo.setRegion(buildingRatio.getRegion()); + bo.setDistrict(buildingRatio.getDistrict()); + bo.setBuilding_name(buildingRatio.getBuilding_name()); + bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price()); + bo.setAvg_price(buildingRatio.getAvg_price()); + bo.setRatio(buildingRatio.getRatio()); + bo.setCreate_user(buildingRatio.getCreate_user()); + bo.setNote(buildingRatio.getNote()); + + model.setBuildingRatioBo(bo); + if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { + model.setMsg("更新成功!"); + } + return model; + } + + public boolean checkBuildingNameAction(BuildingRatioModel model) { + model.setViewType("json"); + model.setViewParam("config", null); + List buildingRatioList = buildingRatioService.findAllByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name()); + if (buildingRatioList.size()>0) { + model.setMsg("此楼栋名称已经存在!"); + return true; + } + return false; + } + + public BuildingRatioService getBuildingRatioService() { + return buildingRatioService; + } + + public void setBuildingRatioService(BuildingRatioService buildingRatioService) { + this.buildingRatioService = buildingRatioService; + } +} 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/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 657388333..db5bf7e45 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -243,12 +243,12 @@ public class DistrictController { } } else { BooleanQuery query = new BooleanQuery(); - Query q1 = new TermQuery(new Term("keyword", model.getKeyword())); - q1.setBoost(0.99f); - query.add(q1, Occur.SHOULD); - // Query q2 = new TermQuery(new Term("keyword_cjk", model.getKeyword())); - // q2.setBoost(0.01f); - // query.add(q2, Occur.SHOULD); +// Query q1 = new TermQuery(new Term("keyword", model.getKeyword())); +// q1.setBoost(0.99f); +// query.add(q1, Occur.SHOULD); + Query q2 = new TermQuery(new Term("keyword_cjk", model.getKeyword())); + q2.setBoost(0.1f); + query.add(q2, Occur.SHOULD); params.add(new QueryParam("$sr", new SrQuery(query))); } } @@ -482,19 +482,34 @@ public class DistrictController { || StringUtils.isBlank(model.getName())) { return ret; } - HttpRequest request = new HttpRequest(); - HashMap params = new HashMap(); - params.put("category", "sell"); - params.put("city", model.getCityDisplay()); - params.put("region", model.getRegion()); - params.put("name", model.getName()); - params.put("count", "4"); - params.put("retainHistory", "true"); - try { - request.getJsonContent(Constants.MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH + "/districtPriceCalculate", params, "UTF-8"); - } catch (HttpRequestException e) { - e.printStackTrace(); - } + + Runnable myRunnable = new Runnable(){ + public void run(){ + try { + District district = districtService.findDistrict(new DistrictKey(model.getCityDisplay(), model.getRegion(), model.getName()),"district"); + if(null != district){ + HttpRequest request = new HttpRequest(); + HashMap params = new HashMap(); + params.put("category", "sell"); + params.put("city", model.getCityDisplay()); + params.put("region", model.getRegion()); + params.put("name", model.getName()); + params.put("count", "4"); + params.put("retainHistory", "true"); + try { + request.getJsonContent(Constants.MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH + "/districtPriceCalculate", params, "UTF-8"); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + }; + Thread thread = new Thread(myRunnable); + thread.start(); + return ret; } @@ -1185,6 +1200,37 @@ public class DistrictController { model.setJsonModel(data); return model; } + /** + * 校验小区名是否为其他小区的别名 + */ + public Object checkDistrictNameAction(@Param(name = "city") String city, @Param(name = "region") String region, + @Param(name = "name") String name, @Param(name = "cat") String cat, @Param(name = "id") String id) { + JsonModel model = new JsonModel(); + boolean exist = false; + + List list = new ArrayList(); + list.add(name); + List params = new ArrayList(); + params.add(new QueryParam("category", cat)); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("alias", name)); + params.add(new QueryParam("visible", 0)); + + List ds = districtService.findAllByParams(params); + if (CollectionUtils.isNotEmpty(ds)) { + for (District d : ds) { + if (!d.getId().equals(id)) { + exist = true; + break; + } + } + } + Map data = new HashMap(); + data.put("exist", exist); + model.setJsonModel(data); + return model; + } /** * 保存新增小区 @@ -1306,7 +1352,7 @@ public class DistrictController { && StringUtils.isNotBlank(district.getRegion())) { // signFiledEditFlag(district, null); districtService.save(district); - districtUpdateTaskService.createTask(district, 5); + districtUpdateTaskService.createTask(district, 5, null); } if (model.isGoPic()) { @@ -1874,6 +1920,7 @@ public class DistrictController { district.setMappingAlias(null); } } + district.setModificationDate(new Date()); districtService.save(district); } @@ -1935,6 +1982,7 @@ public class DistrictController { district.setLandProperty(model.getLandProperty()); } + district.setModificationDate(new Date()); districtService.save(district); } return model; @@ -2014,28 +2062,28 @@ public class DistrictController { districtUpdateTaskService.createTask(orgDis, 2, newName, newRegion); districtUpdateTaskService.createTask(orgDis, 6, newName, newRegion); - District distTask = new District(); - distTask.setCity(orgDis.getCity()); - if(StringUtils.isNotBlank(newName)){ - distTask.setRegion(newRegion); - }else{ - distTask.setRegion(orgDis.getRegion()); - } - - distTask.setEstateType2(orgDis.getEstateType2()); - if(StringUtils.isNotBlank(newName)){ - distTask.setName(newName); - }else{ - distTask.setName(orgDis.getName()); - } - - districtUpdateTaskService.createTask(distTask, 5); +// District distTask = new District(); +// distTask.setCity(orgDis.getCity()); +// if(StringUtils.isNotBlank(newName)){ +// distTask.setRegion(newRegion); +// }else{ +// distTask.setRegion(orgDis.getRegion()); +// } +// +// distTask.setEstateType2(orgDis.getEstateType2()); +// if(StringUtils.isNotBlank(newName)){ +// distTask.setName(newName); +// }else{ +// distTask.setName(orgDis.getName()); +// } +// +// districtUpdateTaskService.createTask(distTask, 5); } - if (StringUtils.isNotBlank(district.getEstateType2()) - && district.getEstateType2().equals(orgDis.getEstateType2())) { - districtUpdateTaskService.createTask(district); - } +// if (StringUtils.isNotBlank(district.getEstateType2()) +// && district.getEstateType2().equals(orgDis.getEstateType2())) { +// districtUpdateTaskService.createTask(district); +// } Map data = new HashMap(); data.put("category", district.getCategory()); @@ -2236,6 +2284,9 @@ public class DistrictController { data.put("markMap", markMap); data.put("modificationDate", new Date()); districtService.updateById(data, district.getId()); + + //创建更新任务,用为更新常州农商行数据 + createJnTask(district.getId(), null); msg = "保存成功了!!!"; } @@ -2245,6 +2296,17 @@ public class DistrictController { return model; } + private void createJnTask(String id, Integer type){ + District newDist = districtService.findDistrictById(id); + District distTask = new District(); + distTask.setCity(newDist.getCity()); + distTask.setRegion(newDist.getRegion()); + distTask.setName(newDist.getName()); + distTask.setEstateType2(newDist.getEstateType2()); + distTask.setId(id); + districtUpdateTaskService.createTask(distTask, 5, type); + } + public Object checkNamesAction(DistrictModel model) { List params = new ArrayList(); @@ -2291,6 +2353,7 @@ public class DistrictController { params = new ArrayList(2); params.add(new QueryParam("category", "district,new_district")); params.add(new QueryParam("name", a)); + params.add(new QueryParam("visible", 0)); ds = districtService.findAllByParams(params); @@ -2406,10 +2469,12 @@ public class DistrictController { JsonModel ret = new JsonModel(); if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) { districtService.logicDeleteById(model.getId()); + createJnTask(model.getId(), 1); } else if (model.getIds() != null) { String[] ids = model.getIds().toString().split(","); for (String id : ids) { districtService.logicDeleteById(id); + createJnTask(id, 1); } } return ret; @@ -2421,10 +2486,12 @@ public class DistrictController { public Object restoreAction(DistrictModel model) throws UnsupportedEncodingException { if (ObjectId.isValid(model.getId())) { districtService.restoreById(model.getId()); + createJnTask(model.getId(), null); } else if (model.getIds() != null) { String[] ids = model.getIds().split("_"); for (String id : ids) { districtService.restoreById(id); + createJnTask(id, null); } } model.setViewType("redirect"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java index b252774f1..ad264fe9a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java @@ -38,6 +38,7 @@ public class ApiUserModel extends BaseModel { private Integer creditLevelStatus; private String priceType; private Map priceRatingMap; + private Integer isMonitor; public String getPriceType() { return priceType; @@ -606,4 +607,12 @@ public class ApiUserModel extends BaseModel { public void setManager(String manager) { this.manager = manager; } + + public Integer getIsMonitor() { + return isMonitor; + } + + public void setIsMonitor(Integer isMonitor) { + this.isMonitor = isMonitor; + } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java new file mode 100644 index 000000000..3c916b169 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java @@ -0,0 +1,152 @@ +package com.fangjia.bkoff.model; + +import com.fangjia.service.bo.BuildingRatioBo; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioModel extends BaseModel{ + + private String id; + private String city_name; + private String region; + private String district; + private String building_name; + private String avg_price; + private String building_avg_price; + private String create_user; + private String note; + private Double ratio; + private String msg; + private List buildingRatioBoList; + private BuildingRatioBo buildingRatioBo; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date c_date; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date m_date; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity_name() { + return city_name; + } + + public void setCity_name(String city_name) { + this.city_name = city_name; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district_name) { + this.district = district_name; + } + + public String getBuilding_name() { + return building_name; + } + + public void setBuilding_name(String building_name) { + this.building_name = building_name; + } + + public Double getRatio() { + return ratio; + } + + public void setRatio(Double ratio) { + this.ratio = ratio; + } + + public Date getC_date() { + return c_date; + } + + public void setC_date(Date c_date) { + this.c_date = c_date; + } + + public Date getM_date() { + return m_date; + } + + public void setM_date(Date m_date) { + this.m_date = m_date; + } + + public List getBuildingRatioBoList() { + return buildingRatioBoList; + } + + public void setBuildingRatioBoList(List buildingRatioBoList) { + this.buildingRatioBoList = buildingRatioBoList; + } + + public BuildingRatioBo getBuildingRatioBo() { + return buildingRatioBo; + } + + public void setBuildingRatioBo(BuildingRatioBo buildingRatioBo) { + this.buildingRatioBo = buildingRatioBo; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public String getCreate_user() { + return create_user; + } + + public void setCreate_user(String create_user) { + this.create_user = create_user; + } + + public String getNote() { + return note; + } + + public void setNote(String note) { + this.note = note; + } + + public String getAvg_price() { + return avg_price; + } + + public void setAvg_price(String avg_price) { + this.avg_price = avg_price; + } + + public String getBuilding_avg_price() { + return building_avg_price; + } + + public void setBuilding_avg_price(String building_avg_price) { + this.building_avg_price = building_avg_price; + } +} diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 410b73fae..29ae67e83 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -57,13 +57,20 @@ 璐︽埛鐢ㄩ�� + + 鏄惁鐩戞帶 + + 涓嶇洃鎺� + 鐩戞帶 + + Email diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index caf99a2c7..31fb2f51a 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -72,6 +72,13 @@ + + 鏄惁鐩戞帶 + + checked="checked" name="isMonitor" value="0" />涓嶇洃鎺� + checked="checked" name="isMonitor" value="1" style="margin-left: 15px;"/>鐩戞帶 + + Email diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl index 0924ceb7e..37afef638 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl @@ -53,6 +53,9 @@ 璐︽埛鐢ㄩ�� + + 鏄惁鐩戞帶 + 鍒版湡鏃堕棿 @@ -114,6 +117,13 @@ 鎴跨敓娲� + + <#if bo.isMonitor==1> + 鏄� + <#else> + 鍚� + + <#if bo.deadTime??> ${bo.deadTime?string("yyyy骞碝M鏈坉d鏃�")} diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl index b173ee86a..2e55ef1c2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl @@ -1016,7 +1016,7 @@ var type = $(this).attr('type'); var data ={}; var commands = Array(); - commands.push({city:'${district.city!}',region:'${district.region!}',name:'${district.name!}',estateType:'${district.estateType2!}'}) + commands.push({id:'${district.id!}',city:'${district.city!}',region:'${district.region!}',name:'${district.name!}',estateType:'${district.estateType2!}'}) data.commands = commands ; data.calcRange = type; $.ajax({ diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl new file mode 100644 index 000000000..3631afd88 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl @@ -0,0 +1,135 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 妤兼爧绯绘暟鏂板 + + <#include "/common_js.ftl" /> + + + + <#include "/layout/header.ftl" /> +
+${msg!''} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 鏍忎綅 + + 鍊� +
鍩庡競
鍖哄煙
灏忓尯鍚嶇О
妤兼爧鍚嶇О
妤兼爧鍧囦环
灏忓尯鍧囦环
妤兼爧绯绘暟
鍒涘缓浜�
澶囨敞
+
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl new file mode 100644 index 000000000..b0b46502e --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/edit.ftl @@ -0,0 +1,136 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 妤兼爧绯绘暟淇℃伅淇敼 + + + <#include "/common_js.ftl" /> + + + + + + <#include "/layout/header.ftl" /> +
+ ${msg!''} + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 鏍忎綅 + + 鍊� +
鍩庡競
鍖哄煙
灏忓尯鍚嶇О
妤兼爧鍚嶇О
妤兼爧鍧囦环
灏忓尯鍧囦环
妤兼爧绯绘暟
鍒涘缓浜�
澶囨敞
+
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl new file mode 100644 index 000000000..047159443 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/list.ftl @@ -0,0 +1,132 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 鍧囦环绠$悊-妤兼爧绯绘暟绠$悊 + + <#include "/common_js.ftl" /> + + + <#include "/layout/header.ftl" /> + +
+
+ 鍩庡競锛� + 鍖哄煙锛� + 灏忓尯锛� + +
+
+ +
+ ${msg!''} + +
+
+
+ 鍏辨湁妤兼爧绯绘暟${buildingRatioBoList?size}涓� +
+ + + + + + + + + + + + + + + + + + + <#if (buildingRatioBoList??&&buildingRatioBoList?size>0)> + <#list buildingRatioBoList as bo> + + + + + + + + + + + + + + + + + +
+ ID + + 鍩庡競 + + 鍖哄煙 + + 灏忓尯鍚嶇О + + 妤兼爧鍚嶇О + + 妤兼爧鍧囦环 + + 灏忓尯鍧囦环 + + 妤兼爧绯绘暟 + + 鍒涘缓浜� + + 鍒涘缓鏃ユ湡 + + 淇敼鏃ユ湡 + + 澶囨敞 + + 鎿嶄綔 +
+ ${bo.id!} + + ${bo.city_name!} + + ${bo.region!} + + ${bo.district!} + + ${bo.building_name!} + + ${bo.building_avg_price!} + + ${bo.avg_price!} + + ${bo.ratio!} + + ${bo.create_user!} + + <#if bo.c_date??> + ${bo.c_date?string("yyyy骞碝M鏈坉d鏃� HH:mm:ss")} + + + <#if bo.m_date??> + ${bo.m_date?string("yyyy骞碝M鏈坉d鏃� HH:mm:ss")} + + + ${bo.note!} + + 缂栬緫 + 鍒犻櫎 +
+
+
+ + + \ No newline at end of file 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 @@       + --> diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 1a3f7a7cd..49bdc8ace 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -851,20 +851,20 @@ function add(){ } } - var mappingAlias = $("#mappingAlias").val(); - if(mappingAlias){ - var aliasArr=alias.toString().split("\n"); - var set=[]; - for(var i=0;i <#assign markMap = district.markMap! />
- + @@ -1130,20 +1130,18 @@ $(document).ready(function(){ alert('鍖哄煙涓嶈兘涓虹┖锛�'); return false; } - - /* + var dLat = $("#dLat").val(); if (dLat == '') { alert('缁忕含搴︿笉鑳戒负绌猴紒'); return false; } - + var dLng = $("#dLng").val(); if (dLng == '') { alert('缁忕含搴︿笉鑳戒负绌猴紒'); return false; } - */ var name = $("#districtName").val(); if (name == '') { @@ -1183,14 +1181,56 @@ $(document).ready(function(){ } } - - /* var address = $("#address").val(); if (address == '') { alert('灏忓尯鍦板潃涓嶈兘涓虹┖锛�'); return false; } - */ + + var id = $("#districtId").val(); + + var flg = false; + jQuery.ajax({ + type: 'POST', + async: false, + url: '../district/validateDistrictName', + data: {city:city,region:region,name:name,cat:"district", id:id}, + dataType: 'json', + timeout: 100000, + success: function(model) { + if(model.exist){ + alert("灏忓尯鍚嶅凡瀛樺湪"); + flg = true; + } + }, + error : function() { + + } + }); + + if(flg){ + return false; + } + + jQuery.ajax({ + type: 'POST', + async: false, + url: '../district/checkDistrictName', + data: {city:city,region:region,name:name,cat:"district",id:id}, + dataType: 'json', + timeout: 100000, + success: function(model) { + if(model.exist){ + alert("灏忓尯鍚嶆槸鍏朵粬灏忓尯鐨勫埆鍚�"); + flg = true; + } + }, + error : function() { + } + }); + if(flg){ + return false; + } jQuery.ajax({ type: 'POST', @@ -1202,15 +1242,15 @@ $(document).ready(function(){ success: function(model) { if (model.msg) { alert('鍒悕涓� "' + model.msg + '" 宸茬粡鏄叾浠栧皬鍖虹殑灏忓尯鍚嶏紝涓嶈兘浣滀负鍒悕浣跨敤锛�'); - return false; - } else { - return true; + flg = true; } }, error : function() { } }); - + if(flg){ + return false; + } return true; }); diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl index 6e6b47bc5..c0cbf0cd5 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl @@ -121,28 +121,30 @@ + + - - 寤虹瓚绫诲瀷 - - -
- 绾啓瀛楁ゼ   - 鍟嗗姟涓績   - 閰掑簵鍐欏瓧妤�   - 鍟嗕綇妤�   - 鍟嗗姟缁煎悎浣�   - 鍟嗕笟缁煎悎浣�   -
-
- 鍒涙剰鍥尯   - 鍒涙剰浜т笟鍥尯   - 鐙爧鍐欏瓧妤�   -
- - +<#-- --> +<#-- 寤虹瓚绫诲瀷--> +<#-- --> +<#-- --> +<#--
--> +<#-- 绾啓瀛楁ゼ  --> +<#-- 鍟嗗姟涓績  --> +<#-- 閰掑簵鍐欏瓧妤�  --> +<#-- 鍟嗕綇妤�  --> +<#-- 鍟嗗姟缁煎悎浣�  --> +<#-- 鍟嗕笟缁煎悎浣�  --> +<#--
--> +<#--
--> +<#-- 鍒涙剰鍥尯  --> +<#-- 鍒涙剰浜т笟鍥尯  --> +<#-- 鐙爧鍐欏瓧妤�  --> +<#--
--> +<#-- --> +<#-- --> 鏉垮潡 @@ -150,12 +152,12 @@ - - 鍟嗗湀 - - - - +<#-- --> +<#-- 鍟嗗湀--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> 涔¢晣琛楅亾 @@ -285,12 +287,12 @@ 涓� - - 杞︿綅鎻忚堪 - - - - +<#-- --> +<#-- 杞︿綅鎻忚堪--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> 鍦颁笂杞︿綅鏁� @@ -335,12 +337,12 @@ - - 妤煎眰鎯呭喌 - - - - +<#-- --> +<#-- 妤煎眰鎯呭喌--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> 鍑�楂� @@ -456,12 +458,12 @@ <#-- --> - - 寮�鐩樻椂闂� - - - - +<#-- --> +<#-- 寮�鐩樻椂闂�--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> 绔e伐鏃堕棿 diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl index bfb1302a3..f6b0277f3 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl @@ -203,36 +203,38 @@ + + - - - <#if markMap?? && markMap["build_type"]?? && markMap["build_type"] == 1> - - <#else> - - - 寤虹瓚绫诲瀷 - - -
- checked >绾啓瀛楁ゼ   - checked>鍟嗗姟涓績   - checked>閰掑簵鍐欏瓧妤�   - checked>鍟嗕綇妤�   - checked>鍟嗗姟缁煎悎浣�   - checked>鍟嗕笟缁煎悎浣�   -
-
- checked>鍒涙剰鍥尯   - checked>鍒涙剰浜т笟鍥尯   - checked>鐙爧鍐欏瓧妤�   -
-
-
- - +<#-- --> +<#-- --> +<#-- <#if markMap?? && markMap["build_type"]?? && markMap["build_type"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 寤虹瓚绫诲瀷--> +<#-- --> +<#-- --> +<#--
--> +<#-- checked >绾啓瀛楁ゼ  --> +<#-- checked>鍟嗗姟涓績  --> +<#-- checked>閰掑簵鍐欏瓧妤�  --> +<#-- checked>鍟嗕綇妤�  --> +<#-- checked>鍟嗗姟缁煎悎浣�  --> +<#-- checked>鍟嗕笟缁煎悎浣�  --> +<#--
--> +<#--
--> +<#-- checked>鍒涙剰鍥尯  --> +<#-- checked>鍒涙剰浜т笟鍥尯  --> +<#-- checked>鐙爧鍐欏瓧妤�  --> +<#--
--> +<#--
--> +<#--
--> +<#-- --> +<#-- --> <#if markMap?? && markMap["block"]?? && markMap["block"] == 1> @@ -242,25 +244,24 @@ 鏉垮潡 - + +<#-- --> +<#-- --> +<#-- <#if markMap?? && markMap["business_quarter"]?? && markMap["business_quarter"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 鍟嗗湀--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - <#if markMap?? && markMap["business_quarter"]?? && markMap["business_quarter"] == 1> - - <#else> - - - 鍟嗗湀 - - - - - - - <#if markMap?? && markMap["township"]?? && markMap["township"]?is_number && markMap["township"] == 1> + <#if markMap?? && markMap["township"]?? && markMap["township"] == 1> <#else> @@ -270,7 +271,6 @@ - <#if markMap?? && markMap["loop_line_info"]?? && markMap["loop_line_info"] == 1> @@ -283,7 +283,6 @@ - @@ -492,7 +491,7 @@ <#if markMap?? && markMap["estate_charge"]?? && markMap["estate_charge"] == 1> <#else> - + 鐗� 涓� 璐� - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> --> <#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- -->
@@ -512,19 +511,19 @@
- <#if markMap?? && markMap["car_site"]?? && markMap["car_site"] == 1> - - <#else> - - - 杞︿綅鎻忚堪 - - -
--> +<#-- <#if markMap?? && markMap["car_site"]?? && markMap["car_site"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 杞︿綅鎻忚堪--> +<#-- --> +<#-- --> +<#--
<#if markMap?? && markMap["land_car_site"]?? && markMap["land_car_site"] == 1> @@ -620,18 +619,18 @@
- <#if markMap?? && markMap["floor_info"]?? && markMap["floor_info"] == 1> - - <#else> - - - 妤煎眰鎯呭喌 - -
--> +<#-- <#if markMap?? && markMap["floor_info"]?? && markMap["floor_info"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 妤煎眰鎯呭喌--> +<#-- --> +<#--
<#if markMap?? && markMap["clear_height"]?? && markMap["clear_height"] == 1> @@ -863,18 +862,18 @@ <#-- --> <#--
- <#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1> - - <#else> - - - 寮�鐩樻椂闂� - -
--> +<#-- <#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 寮�鐩樻椂闂�--> +<#-- --> +<#--
<#if markMap?? && markMap["finish_building_date"]?? && markMap["finish_building_date"] == 1> @@ -1276,34 +1275,34 @@ $(function(){ return true; }); - $("#region").change(function(){ - jQuery.ajax({ - type: 'POST', - url: '../district/getBlocks', - data: encodeURI("cityDisplay=" + $("#districtCity").val() + "®ion=" + $(this).val()), - dataType: 'json', - timeout: 100000, - success: function(model) { - $("#block option").remove(); - if (model.blockList.length > 0) { - $.each(model.blockList, function(i, block){ - if ('${district.block!}' == block) { - $("").appendTo($("#block")); - } else { - $("").appendTo($("#block")); - } - }); - $("#tr_block").show(); - } else { - $("#block option").remove(); - $("#tr_block").hide(); - } - }, - error : function() { - } - }); - }); - $("#region").change(); + <#--$("#region").change(function(){--> + <#-- jQuery.ajax({--> + <#-- type: 'POST', --> + <#-- url: '../district/getBlocks',--> + <#-- data: encodeURI("cityDisplay=" + $("#districtCity").val() + "®ion=" + $(this).val()),--> + <#-- dataType: 'json',--> + <#-- timeout: 100000,--> + <#-- success: function(model) {--> + <#-- $("#block option").remove();--> + <#-- if (model.blockList.length > 0) {--> + <#-- $.each(model.blockList, function(i, block){--> + <#-- if ('${district.block!}' == block) {--> + <#-- $("").appendTo($("#block"));--> + <#-- } else {--> + <#-- $("").appendTo($("#block"));--> + <#-- }--> + <#-- });--> + <#-- $("#tr_block").show();--> + <#-- } else {--> + <#-- $("#block option").remove();--> + <#-- $("#tr_block").hide();--> + <#-- }--> + <#-- },--> + <#-- error : function() {--> + <#-- }--> + <#-- });--> + <#--});--> + <#--$("#region").change();--> $("#goPopMap").click(function(){ var url = "../district/map?cityDisplay=" + encodeURI($("#display").val()); diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/officelist.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/officelist.ftl index 961807a3d..5ca872b27 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/officelist.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/officelist.ftl @@ -42,20 +42,23 @@ <#include "officeHeader.ftl"/>
+ 鍩庡競: <@d_city defaultValue="${cityDisplay!}" callback="changeCity" callbackField="display" name="cityDisplay" showCountry = "1" /> + 鍖哄煙: - - 绫诲瀷锛� + 绫诲瀷: @@ -345,6 +348,8 @@ + +
diff --git a/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl b/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl index 719e92e83..d44922973 100644 --- a/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl @@ -90,6 +90,7 @@
    <@menuitem uri='/avgPriceUpdate/doCreatTask' text="浣忓畢鍧囦环绠$悊" /> <@menuitem uri='/averagerConfig/list' text="浣忓畢绯绘暟绠$悊" /> + <@menuitem uri='/buildingRatio/list' text="妤兼爧绯绘暟绠$悊" /> <@menuitem uri='/avgPriceUpdate/listQR' text="浠锋牸璐ㄩ噺璺熻釜" /> <@menuitem uri='/avgPriceUpdate/listSQR' text="鏍锋湰璐ㄩ噺璺熻釜" /> <@menuitem uri='/comparePrice/listQR' text="璋冩煡鏁版嵁璺熻釜" /> diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index e41d90187..12cbcc5f6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -371,8 +371,8 @@ public class SaleLeadsController { "业务需求:" + saleLeads.getBusiness() + "\n\n" + "姓名:" + saleLeads.getUname() + "\n\n" + "手机:" + saleLeads.getMobile() + "\n\n" - + "咨询内容:" + saleLeads.getRemarks()+ "\n\n" - + "IP:" + ip+ "\n\n" ; + + "IP:"+ip + "\n\n" + + "咨询内容:" + saleLeads.getRemarks()+ "\n\n" ; body = body.replaceAll("null", "").replaceAll("其他,请填写", ""); if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { body += "线索来源:百度"; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java index 8af39b5f4..0cbe82863 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java @@ -22,6 +22,6 @@ public interface DistrictUpdateTaskDao extends MongoDao { void createTask(District district); - void createTask(District district, int status); + void createTask(District district, int status, Integer type); } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java index bbd3aec67..9da2fa32b 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java @@ -87,7 +87,7 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl } @Override - public void createTask(District district, int status) { + public void createTask(District district, int status, Integer type) { DistrictUpdateTask task = new DistrictUpdateTask(); task.setCity(district.getCity()); task.setRegion(district.getRegion()); @@ -99,6 +99,12 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl }else{ task.setEstateType("district"); } + if(null != type){ + task.setType(type); + } + if(StringUtils.isNotBlank(district.getId())){ + task.setCommId(district.getId()); + } this.save(task); } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java new file mode 100644 index 000000000..f530cfff3 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDao.java @@ -0,0 +1,12 @@ +package com.fangjia.dal.mongo.dao.bkoff; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.bkoff.AveragerConfig; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public interface BuildingRatioDao extends MongoDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java new file mode 100644 index 000000000..192ad0456 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/bkoff/BuildingRatioDaoImpl.java @@ -0,0 +1,12 @@ +package com.fangjia.dal.mongo.dao.bkoff; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.bkoff.AveragerConfig; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioDaoImpl extends MongoDaoImpl implements BuildingRatioDao { +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java index c9227c326..268ec1aa3 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java @@ -27,6 +27,7 @@ public class DistrictUpdateTask implements MongoEntity { private Integer status; // 1:删除 2:区域,各称修改 3.关联删除 4.物业类型修改 5:新增小区 private String msg; private String estateType; + private String commId; @Id @GeneratedValue @@ -121,4 +122,12 @@ public class DistrictUpdateTask implements MongoEntity { public void setNewCity(String newCity) { this.newCity = newCity; } + @Column(name="comm_id") + public String getCommId() { + return commId; + } + + public void setCommId(String commId) { + this.commId = commId; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java new file mode 100644 index 000000000..bf41d3441 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/BuildingRatio.java @@ -0,0 +1,130 @@ +package com.fangjia.dal.mongo.model.bkoff; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +@Entity +@Table(name = "business.building_ratio") +public class BuildingRatio implements MongoEntity { + + private String id; + private String city; + private String region; + private String district; + private String building_name; + private String building_avg_price; + private String avg_price; + private Double ratio; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date c_date; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date m_date; + private String create_user; + private String note; + + @Id + @GeneratedValue + @Column(name = "_id") + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + @Column(name = "city") + public String getCity() { + return city; + } + public void setCity(String city) { + this.city = city; + } + @Column(name = "region") + public String getRegion() { + return region; + } + public void setRegion(String region) { + this.region = region; + } + @Column(name = "district") + public String getDistrict() { + return district; + } + public void setDistrict(String district) { + this.district = district; + } + @Column(name = "building_name") + public String getBuilding_name() { + return building_name; + } + public void setBuilding_name(String building_name) { + this.building_name = building_name; + } + @Column(name = "ratio") + public Double getRatio() { + return ratio; + } + public void setRatio(Double ratio) { + this.ratio = ratio; + } + @Column(name = "c_date") + public Date getC_date() { + return c_date; + } + public void setC_date(Date c_date) { + this.c_date = c_date; + } + @Column(name = "m_date") + public Date getM_date() { + return m_date; + } + public void setM_date(Date m_date) { + this.m_date = m_date; + } + @Column(name = "create_user") + public String getCreate_user() { + return create_user; + } + + public void setCreate_user(String create_user) { + this.create_user = create_user; + } + @Column(name = "note") + public String getNote() { + return note; + } + + public void setNote(String note) { + this.note = note; + } + @Column(name = "building_avg_price") + public String getBuilding_avg_price() { + return building_avg_price; + } + + public void setBuilding_avg_price(String building_avg_price) { + this.building_avg_price = building_avg_price; + } + @Column(name = "avg_price") + public String getAvg_price() { + return avg_price; + } + + public void setAvg_price(String avg_price) { + this.avg_price = avg_price; + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java index 1cddeac31..52806e4df 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java @@ -39,6 +39,8 @@ public class ApiUser implements SqlEntity { private String manager; + private Integer isMonitor; + @Id @Column(name = "ID") public long getId() { @@ -175,4 +177,12 @@ public class ApiUser implements SqlEntity { public void setManager(String manager) { this.manager = manager; } + @Column(name = "IS_MONITOR") + public Integer getIsMonitor() { + return isMonitor; + } + + public void setIsMonitor(Integer isMonitor) { + this.isMonitor = isMonitor; + } } 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 95d5b2ad4..1569c7a87 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 @@ -179,7 +179,7 @@ public class AddrSvcController { /** * 地址匹配 */ - public Object matchAction(AddesssMatchModel model) { + public Object matchAction(AddesssMatchModel model) throws Exception { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -195,16 +195,13 @@ public class AddrSvcController { params.put("category", model.getCategory()); params.put("district", model.getSuggestDistrict()); try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/match", params, "UTF-8"); - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if (json.containsKey("result")) { - basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json.get("result"))); - } + //新匹配接口 + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); + if (json != null && json.size()>0) { + BasicModel basicModel = new BasicModel(0, "ok"); + basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json)); mav.setModel(basicModel); - } else { + }else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } } catch (Exception e) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GuzhiController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GuzhiController.java index 870dda5e3..d4f0a3311 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GuzhiController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/GuzhiController.java @@ -4,6 +4,8 @@ import java.util.Date; import javax.validation.Valid; +import com.fangjia.dal.sql.model.User; +import com.fangjia.service.sql.UserService; import org.apache.commons.lang.StringUtils; import org.bson.types.ObjectId; @@ -39,6 +41,7 @@ public class GuzhiController { private EvaluationService evaluationService; private SmsService smsService; private DistrictService districtService; + private UserService userService; private static final String DING_MSG_ROBOT_ID = "58c62a54d92790b58177c6d6"; @@ -150,7 +153,9 @@ public class GuzhiController { UniversalDto dto = UniversalDto.newDto(); dto.append("caseId", model.getCaseId()); mv.setModel(BasicModel.buildOKModel().setResult(dto)); - String msg = "【房价网-人工估值】接收到新的人工询价,请求请及时处理!城市:" + evaluation.getCity() + + User user = userService.findById(token.getUserId()); + String msg = "【房价网-人工估值】客户: "+user.getDisplayName()+" 提交新的人工询价,请求请及时处理!城市:" + evaluation.getCity() + " 区域:" + evaluation.getRegion() + " 小区名:" + evaluation.getDistrictName(); DingDingMessageUtil.sendTextMessage("065f4a05d5f87eb39a9f9e048eeefb80c1f7560446f8926441de80453c160c60", msg); return mv; @@ -183,4 +188,8 @@ public class GuzhiController { public void setDistrictService(DistrictService districtService) { this.districtService = districtService; } + + public void setUserService(UserService userService) { + this.userService = userService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index 800a2360d..c89bc6f53 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -1282,7 +1282,10 @@ public class WeiXinEvaluationController { Point point = new Point(Double.valueOf(ll[0]), Double.valueOf(ll[1])); points.add(point); } - Point point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0); + Point point = null; + if(district.getLng2()!=null){ + point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0); + } //boolean flag = InsidePolygon.aboutZone(point, points); //boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points); boolean flag = InsidePolygon2.checkIsInPolygon(point, points); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy index f34d40421..7ddc3a095 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy @@ -9,7 +9,7 @@ import com.mongodb.DBCollection /** * 深圳公众号成交数据录入 */ -def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\深圳4月份二手房成交数据汇总.xls", 0, 1) +def datas = ExcelUtils.read("D:\\数据\\建行\\房产估值\\成交\\深圳6月份二手房成交数据汇总.xls", 0, 1) def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) @@ -51,7 +51,19 @@ for(def d : datas){ map.region = d['B'] def roomStr = d['E'] if(roomStr){ - map.room = roomStr.toString().toDouble().toInteger() + if(roomStr.contains("-")){ + def arrs = roomStr.split("-") + try{ + map.room = arrs[0].toString().toInteger() + }catch(Exception e){ + println "room error" + } + map.hall = arrs[1].toString().toInteger() + map.toilet = arrs[3].toString().toInteger() + }else{ + map.room = roomStr.toString().toDouble().toInteger() + } + } map.area = d['F'].toString().toDouble() @@ -59,7 +71,13 @@ for(def d : datas){ map.avg_price = (int)(d['H'].toString().toDouble()) map.sell_price = (int)(d['I'].toString().toDouble()*10000) def trade_date = d['J'] - map.trade_date = trade_date + if(trade_date){ + map.trade_date = trade_date + }else{ + def trade_date1 = DateUtils.getRandomDate("2023-05-16", "2023-05-31") + map.trade_date = DateUtils.parseFromTightByPattern(trade_date1, "yyyy-MM-dd") + } + map.source = "深房家族" map.create_date = new Date() map.m_date = new Date() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy index 61bd39b7e..e6e02e23d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy @@ -35,12 +35,19 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ def citys = CcbCommonUtils.getRunningCitys(args) def rets = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() + def today = new Date().getDate() + for(def city : citys){ // def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) // def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "estate_type2","name_cat","build_type", "lng","c_date", "m_date"]) -// def distIds = CcbCommonUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)); - def distIds = PgsqlCommUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)) + def distIds = null + if(today<=10){ + distIds = CcbCommonUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)); + }else{ + distIds = PgsqlCommUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)) + } + def rows = createDatas(cityCodeDatas.get(city), distIds) rets.addAll(rows) println city +" "+rows.size() 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 17860e977..49d4de707 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 @@ -49,15 +49,25 @@ class BigdataCommunityBatch extends BaseBatch{ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def index = 0 + def today = new Date().getDate() + println "starting 。。。。。。。。。" for(def city : citys){ index ++ + + 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 = null + if(today<=10){ + ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //融合导数时使用 + }else{ + ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //估值导数时使用 + } + def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) rets = addDeleteDist(dists, ccbMaps, rets) rows.addAll(rets) @@ -77,10 +87,10 @@ class BigdataCommunityBatch extends BaseBatch{ FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); println "txt 生成->导Oracle" - -// delPgData() -// saveToPgSql(rows) - + if(today > 10){ + delPgData() + saveToPgSql(rows) + } // ExcelUtils.write("d:\\数据\\建行\\房产估值\\数据文件\\excel\\bigdata_community.xlsx", allDatas, "数据") // def datas = readTxt("d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_COMMUNITY_GJ.dat") // delPgData() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy index 4d289d469..1f2867d17 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy @@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern @@ -33,7 +34,7 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class BigdataDealBatch extends BaseBatch{ - def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")); + def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -24, "yyyyMM")); def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd")); @@ -66,54 +67,58 @@ class BigdataDealBatch extends BaseBatch{ curDate = args[1].toString().toInteger() } println "curDate:"+curDate - def allCitys = CommonDatautils.findAllCity() - for(def city : allCitys){ -// if(!ccbCitys.contains(city)){ - addDealPriceMatch(city); -// } +// def allCitys = CommonDatautils.findAllCity() +// for(def city : allCitys){ +//// if(!ccbCitys.contains(city)){ +// addDealPriceMatch(city); +//// } +// } + + + def rows = [] + def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + def index = 0 + for(def city : citys){ + index ++ + def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) + def ppeDists = [:] + + def dealIds = findHistoryDealIds(city) + println "历史id加载量:"+dealIds.size() + def statMap = [:]//getDistrictStatByCity(city, weekend) + if(city=="上海"){ + def youDataTrade = getYouDaData(statMap) + def youdaDatas = createData(city, youDataTrade, cityCodeDataMap, distCodeMap, "youda", dealIds) + rows.addAll(youdaDatas) + println city +" "+youdaDatas.size() + } + + def trades = getCityData(city, statMap, ppeDists) + if(trades){ + def rets = createData(city, trades, cityCodeDataMap, distCodeMap, "other", dealIds) + rows.addAll(rets) + println "【${index}】"+city +" 成交共:"+rets.size() + + def cityDatas = [] + cityDatas << headers + cityDatas.addAll(rows) + } + } -// def rows = [] -// def headers = []//["城市ID","成交ID","城市名称","行政区ID","行政区名称","街道","门牌号","小区ID","小区名称","楼栋ID","楼栋编号","楼栋名称","单元ID","单元编号","单元名称","户ID","详细地址","建筑年代","权属","权属年限","期数","所在楼层","层类型","总楼层数","建筑类型","建筑结构","建筑面积","套内面积","户型","室","厅","厨","卫","房屋用途","室内结构","朝向","装修情况","评估编号","成交单价","成交总价","申报总价","评估总价","网签合同编号","交易日期","交易类型","出售付款方式","成交周期","是否有电梯","赠送面积(地面花园)","赠送面积(露台)","赠送面积(阳台)","赠送面积(飘窗)","赠送面积(阁楼)","赠送面积(车库)","赠送面积(地下室)","赠送面积(其他)","房源数据来源","中介公司ID","中介公司名称","备注","创建时间","更新时间","来源公司","成交金额","数据时间"] -// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() -// def index = 0 -// for(def city : citys){ -// index ++ -// def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) -// def ppeDists = [:] -// -// def statMap = [:]//getDistrictStatByCity(city, weekend) -// if(city=="上海"){ -// def youDataTrade = getYouDaData(statMap) -// def youdaDatas = createData(youDataTrade, cityCodeDataMap, distCodeMap, "youda") -// rows.addAll(youdaDatas) -// println city +" "+youdaDatas.size() -// } -// -// def trades = getCityData(city, statMap, ppeDists) -// if(trades){ -// def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") -// rows.addAll(rets) -// println "【${index}】"+city +" 成交共:"+rets.size() -// -// def cityDatas = [] -// cityDatas << headers -// cityDatas.addAll(rows) -// } -// -// } -// -// def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" -// if(CommonDatautils.isWindow()){ -// fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" -// } -// -// FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); -// println "txt 生成 " + rows.size() -// -// saveToPgSql(rows) + + def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" + if(CommonDatautils.isWindow()){ + fileName = "d:\\数据\\建行\\房产估值\\数据文件\\txt\\BIGDATA_DEAL_GJ.dat" + } + + FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); + println "txt 生成 " + rows.size() + + saveToPgSql(rows) } - def createData(def rets, cityCodeDatas, distCodeMap, source){ + def createData(city, def rets, cityCodeDatas, distCodeMap, source, dealIds){ def result = Collections.synchronizedList(new ArrayList()); def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(rets.size()) @@ -122,29 +127,36 @@ class BigdataDealBatch extends BaseBatch{ // def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd') // def lianjiaPriceMap = getDistrictStatByCity("上海", startDate) - def ccbPriceMap = getCommunityPrices("上海") + def ccbPriceMap = null + if(city == "上海"){ + ccbPriceMap = getCommunityPrices("上海") + } + for(def i=0;i def map = [:] @@ -490,5 +491,43 @@ class DealPriceDataProcess { return count } + def statPpe(){ + def path = "C:\\Users\\gaojuan\\Desktop\\估值数据统计.xlsx" + ExcelUtils.multiThreadingModify(path, { row -> + def dates = [202208,202209,202210,202211,202212,202301,202302,202303,202304,202305,202306] + def deal_pes = [] + def third_pes = [] + for(def d : dates){ + def map = findPeGteCity(row['B'], d) + if(map.deal_pe){ + deal_pes << map.deal_pe + } + if(map.third_pe){ + third_pes << map.third_pe + } + } + if(deal_pes){ + row['F'] = deal_pes.sum()/deal_pes.size() + } + if(third_pes){ + row['G'] = third_pes.sum()/third_pes.size() + } + println row['B'] + " "+row['F']+" "+row['G'] + }) + + } + + + + def findPeGteCity(cityName, yearmonth){ + def sql = "SELECT gujiamdltst_ppe15_pct,gujiatrdpttstppe15pct from t_app_p9pha_plda.avm_evaluation_gj_h where urbn_nm='${cityName}' and gujia_bds_yrmo=${yearmonth}" + def map = [:] + pgsqlInstance.eachRow(sql,{r-> + map.deal_pe = r.gujiamdltst_ppe15_pct + map.third_pe = r.gujiatrdpttstppe15pct + }); + return map + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy index 91fb02cdc..99dc7bf92 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //添加自己库中的人工指导价 - def prices = CcbCommonUtils.findPersonPrice(city, "2023-04-26", "2023-05-27") + def prices = CcbCommonUtils.findPersonPrice(city, "2023-06-26", "2023-07-26") // def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") if(prices){ def distMap = getDistrictMap(city) @@ -84,7 +84,7 @@ class GuiDingPriceBatch extends BaseBatch{ saveToPgSql(rows) // -// //更新静态数据表 + //更新静态数据表 // updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy index f2a564cb7..2fd7e0c2f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy @@ -17,4 +17,14 @@ class PgsqlCommUtils { }); return set } + + + public static def findAllDistrictCount(def cityid){ + def sql = "select count(gujia_comm_id) from base.t0831_bigdata_community_gj_h where urbn_id='${cityid}' and gujia_bds_bds_st=0"; + def count = 0 + sqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index db8fef0a1..0fd8eaa49 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy @@ -33,8 +33,8 @@ import java.util.regex.*; def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") -def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", - "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") +//def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", +// "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") @@ -45,8 +45,8 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) -//def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", -// "postgres", "postgres", "org.postgresql.Driver") +def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") //def citys = ["山南","黄南州","甘南","克孜勒苏","嘉峪关","海北州","阿拉善盟","怒江州","和田","日喀则","昌都","海南州","玉树州","吐鲁番","阿勒泰","三沙","塔城","甘孜州","果洛州","林芝","那曲","阿坝州","神农架"] //def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() @@ -1287,50 +1287,50 @@ def findAvgPrice(def commid, def pgsqlInstance, def cityid){ -//def fileName = "D:\\数据\\建行\\房产估值\\指导价\\人工指导价录入_1020.xlsx" -// +def fileName = "D:\\数据\\建行\\房产估值\\指导价\\录入国信达价格_0602.xlsx" + //ExcelUtils.multiThreadingModify(fileName, {d-> // if(d['A']){ -//// def region = RegionData.formatRegion(d['A'], d['B']) -//// if(region){ -//// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") -//// if(dist){ -//// d['E'] = dist.region -//// d['F'] = dist._id.toString() -//// } -//// } -// if(!d['F']){ -// def dist = CommonDatautils.findDistrictById(d['A']) -//// +// def region = RegionData.formatRegion(d['B'], d['C']) +// if(region){ +// def dist = CommonDatautils.findDistrict(d['B'], region, d['E'], "district") // if(dist){ -//// d['H'] = dist.region -//// d['G'] = dist.name -// d['F'] = dist.status +// d['G'] = dist.region +// d['H'] = dist._id.toString() // } // } +//// if(!d['F']){ +//// def dist = CommonDatautils.findDistrictById(d['A']) +////// +//// if(dist){ +////// d['H'] = dist.region +////// d['G'] = dist.name +//// d['F'] = dist.status +//// } +//// } // // } //},0) -def fileName = "C:\\Users\\gaojuan\\Desktop\\房价网新增小区数据_0427.xlsx" -ExcelUtils.multiThreadingModify(fileName, { d -> - def count = CommonDatautils.findDistrictCount(null, d['B'], d['C'], "district") - if(count && count==1){ - def dist = CommonDatautils.findDistrict(null, d['B'], d['C'], "district") - d['E'] = dist.city - } - -// def dist = CommonDatautils.findDistrictById(d['A']) -// if(dist){ -// d['B'] = dist.region -// d['C'] = dist.name -// d['J'] = dist.status +//def fileName = "C:\\Users\\gaojuan\\Desktop\\房价网新增小区数据_0427.xlsx" +//ExcelUtils.multiThreadingModify(fileName, { d -> +// def count = CommonDatautils.findDistrictCount(null, d['B'], d['C'], "district") +// if(count && count==1){ +// def dist = CommonDatautils.findDistrict(null, d['B'], d['C'], "district") +// d['E'] = dist.city // } -// def newRegion = RegionData.formatRegion(d['A'], d['B']) -// d['F'] = newRegion -},0) +// +//// def dist = CommonDatautils.findDistrictById(d['A']) +//// if(dist){ +//// d['B'] = dist.region +//// d['C'] = dist.name +//// d['J'] = dist.status +//// } +//// def newRegion = RegionData.formatRegion(d['A'], d['B']) +//// d['F'] = newRegion +//},0) //ExcelUtils.modify(fileName, {d-> // if(d['A']){ @@ -1364,6 +1364,53 @@ def findGuidedPrice(sqlInstance, id){ return count } +def findPgDealPrice(c, pgsqlInstance, startDate){ + def sql = "select count(a.gujia_comm_id) from (SELECT distinct gujia_comm_id from base.t0831_bigdata_deal_gj_h where urbn_nm='${c}' and txn_dt>='${startDate}') a" + def count = 0 + pgsqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count +} + +citys = CcbCommonUtils.citys_all +def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +//def dates = ["2022-07-01","2022-08-01","2022-09-01","2022-10-01","2022-11-01","2022-12-01","2023-01-01","2023-02-01","2023-03-01","2023-04-01","2023-05-01","2023-06-01"] +def dates = [202208,202209,202210,202211,202212,202301,202302,202303,202304,202305,202306] +def rows = [] +def headers = [] +headers << "城市" +headers.addAll(dates) +rows << headers +for(def c : citys){ + def row = [] + row << c + def disCount = PgsqlCommUtils.findAllDistrictCount(cityCodeDataMap.get(c)) +// for(def d : dates){ + def startDate = "2022-07-01" + def count = findPgDealPrice(c, pgsqlInstance, startDate) + row << count*100/disCount + +// def map = findSampleRate(pgsqlInstance, c, d) +// row << map.third +// } + rows << row +} +ExcelUtils.write("D:\\数据\\建行\\数据统计结果\\成交占比统计-年.xlsx", rows, "第三方") + + + + + +def findSampleRate(pgsqlInstance, cityName, yearmonth){ + def sql = "SELECT urbn_nm,gujiamdltst_ppe15_pct,gujiatrdpttstppe15pct from t_app_p9pha_plda.avm_evaluation_gj_h where urbn_nm='${cityName}' and gujia_bds_yrmo=${yearmonth}" + def map = [:] + pgsqlInstance.eachRow(sql,{r-> + map.deal = r.gujiamdltst_ppe15_pct + map.third = r.gujiatrdpttstppe15pct + }); + return map +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy index da8662b0e..492fb152d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -87,7 +87,7 @@ class ThirdPartyPriceBatch extends BaseBatch { } def header = []//["第三方均价ID","楼盘ID","小区名称","城市ID","城市名称","行政区ID","行政区名称","均价对应的月份","诸葛找房均价","安居客均价","房天下均价","链家均价","城市房产均价","麦田均价","贝壳均价","淘房365","中原均价","兔博士均价","Q房均价","房探均价","房多多均价","我爱我家均价","创建时间","更新时间","来源公司"] - FileUtils.batchCreateFile(rows, fileName, header, "utf-8", true); + FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false); saveToPgSql(rows) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy index e8bd49824..71420fef7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy @@ -45,6 +45,7 @@ class TradeStatLog { // task.thirdPartyStat() // println Calendar.getInstance().get(Calendar.YEAR) // task.averageStat() + // task.deleteDistrict() // task.deleteDealData() // task.deleteDealData2() @@ -92,13 +93,13 @@ class TradeStatLog { def run(){ def citys = CcbCommonUtils.citys_all; def rets = [] - rets << ["城市","23年2月总量","23年3月总量","23年4月总量","占比","贝壳","链家", "我爱我家","房天下","中原"] + rets << ["城市","23年4月总量","23年5月总量","23年6月总量","占比","贝壳","链家", "我爱我家","房天下","中原"] def sources = ["贝壳找房","链家在线","我爱我家","房天下","中原地产"] //def startDate = "2021-05-01" - def startDate = "2023-02-01" - def date = "2023-03-01" - def endDate = "2023-04-01" - def newDate = "2023-05-01" + def startDate = "2023-04-01" + def date = "2023-05-01" + def endDate = "2023-06-01" + def newDate = "2023-07-01" for(def city : citys){ def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy index d7be2d646..3b095eb3c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy @@ -19,9 +19,9 @@ class CcbDataStat { static main(args) { def task = new CcbDataStat() -// task.run() + task.run(args) // task.tradeRun() - task.regionDistStat() +// task.regionDistStat() } def regionDistStat(){ @@ -124,22 +124,37 @@ class CcbDataStat { return count } - def run(){ + def run(args){ + def citys = CcbCommonUtils.getRunningCitys(args) def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() - ExcelUtils.multiThreadingModify("D:\\数据\\建行\\建行成交\\92个城市字段覆盖率情况.xlsx",{ d-> - if(d['A']) { - def citycode = cityCodeDataMap.get(d['A']) - def total = findTotalCount(citycode) - def f_count = findDistFinishDate(citycode) - def b_count = findBuildTypeCount(citycode) - def f_pre = DataHandleUtils.getDoubleRound(2, f_count*100/total) - def b_pre = DataHandleUtils.getDoubleRound(2, b_count*100/total) - d['C'] = f_pre - d['D'] = b_pre - d['E'] = total - println d['A'] +" "+ total +" "+f_count+" "+b_count - } - }) + def rets = [] + rets << ["城市","经纬度","物业类型","建筑年代","建筑类型","绿化率","容积率"] + for(def c : citys){ + def ret = [] + ret << c + def citycode = cityCodeDataMap.get(c) + def total = findTotalCount(citycode) + def lat_count = findLocationCount(citycode) + def f_count = findDistFinishDate(citycode) + def b_count = findBuildTypeCount(citycode) + def g_count = findVirescencePercent(citycode) + def c_count = findCubagePercentPercent(citycode) + def location_pre = DataHandleUtils.getDoubleRound(2, lat_count*100/total) + def f_pre = DataHandleUtils.getDoubleRound(2, f_count*100/total) + def b_pre = DataHandleUtils.getDoubleRound(2, b_count*100/total) + def g_pre = DataHandleUtils.getDoubleRound(2, g_count*100/total) + def c_pre = DataHandleUtils.getDoubleRound(2, c_count*100/total) + ret << location_pre + ret << 100 + ret << b_pre + ret << f_pre + ret << g_pre + ret << c_pre + ret << total + rets << ret + } + + ExcelUtils.write("D:\\数据\\建行\\房产估值\\建行供数重要字段覆盖率.xlsx", rets, "统计") } def findTotalCount(citycode){ @@ -168,4 +183,32 @@ class CcbDataStat { }) return count } + + def findLocationCount(citycode){ + def sql = "select count(*) as count from bigdata_community_gj where cityid='${citycode}' and status=0 and longitude>0";//where cityId in (350200,150100) + def count = 0 + sqlInstance.eachRow(sql, { r -> + count = r.count + }) + return count + } + + def findVirescencePercent(citycode){ + def sql = "select count(*) as count from bigdata_community_gj where cityid='${citycode}' and status=0 and GREENINGRATE is not null";//where cityId in (350200,150100) + def count = 0 + sqlInstance.eachRow(sql, { r -> + count = r.count + }) + return count + } + + + def findCubagePercentPercent(citycode){ + def sql = "select count(*) as count from bigdata_community_gj where cityid='${citycode}' and status=0 and PLOTRATIO is not null";//where cityId in (350200,150100) + def count = 0 + sqlInstance.eachRow(sql, { r -> + count = r.count + }) + return count + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy index 58407d269..c11a472af 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy @@ -37,44 +37,47 @@ class ExportAllPgData { // exportEvaluationRateData() // exportBigdataPoiData() // exportBigdataDistrictData() -//// -//// //第三方网站权重表 +////// +////// //第三方网站权重表 // exportWebsiteRate(); -// +//// // exportGuidedPrice()//随人工改变// // exportCommunityGuidedPrice()//随政策// -// //处理小区情况 +//// //处理小区情况 // exportCommunityStaging()//没cityid // exportBigdataCommunity()// -// +//// // exportCommunityBuildType()// -// - exportThirdPartyPrice2(new_dists)// - exportBigdataForsale(new_dists) //现在按updatetime导出 +//// +// exportThirdPartyPrice2(new_dists)// +// exportBigdataForsale(new_dists) //现在按updatetime导出 // exportBigdataDeal(new_dists) //2022-07-01 - - - //计算结果相关 +// +// +// //计算结果相关 // exportAvmEvaluationGJNB() // exportAVMEvaluationItemGJNB() -// +//// // exportCityPrice() // exportRegionPrice() - exportCommunityBasePrice() + + exportCommunityPdescribeGj() + exportCommCaseDetailGj() + +// exportCommunityBasePrice() // exportCommunityBasePrice1(curMonth) -// exportCommunityPdescribeGj() -// exportCommCaseDetailGj() + // -// exportInOk() + exportInOk() //// -// SSHHelperTest jschCommand = new SSHHelperTest(); -// System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); + SSHHelperTest jschCommand = new SSHHelperTest(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); } def exportEvaluationRateData() { - def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_bds_ceft,gujia_bds_seq, gujia_urbn,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_evaluate_rate_gj_h"; + def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_bds_ceft,gujia_bds_seq, gujia_urbn,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from base.t0831_evaluate_rate_gj_h"; def allRows = [] pgsqlInstance.eachRow(sql, { r -> def data = [] @@ -102,7 +105,7 @@ class ExportAllPgData { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,gujia_bds_ltt,gujia_bds_lgt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_bigdata_poi_gj_h where urbn_id='${cityCode}'"; + def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,gujia_bds_ltt,gujia_bds_lgt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from base.t0831_bigdata_poi_gj_h where urbn_id='${cityCode}'"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.urbn_id @@ -133,7 +136,7 @@ class ExportAllPgData { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_lgc_admndiv_dsc,gujia_lgc_admndiv_cd,gujia_adiv_cd_val,gujia_bds_data_tm_val from "+database+".t0831_bigdata_district_gj_h where urbn_id='${cityCode}'"; + def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_lgc_admndiv_dsc,gujia_lgc_admndiv_cd,gujia_adiv_cd_val,gujia_bds_data_tm_val from base.t0831_bigdata_district_gj_h where urbn_id='${cityCode}'"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_admndiv_id @@ -164,7 +167,7 @@ class ExportAllPgData { } def exportWebsiteRate(){ - def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_bds_wgt,gujia_bds_tp,gujia_src_co,urbn_id,gujia_urbn,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_website_config_gj_h"; + def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_bds_wgt,gujia_bds_tp,gujia_src_co,urbn_id,gujia_urbn,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_website_config_gj_h"; def allRows = [] pgsqlInstance.eachRow(sql, { r -> def data = [] @@ -194,7 +197,7 @@ class ExportAllPgData { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_fsid,gujia_bds_id,comm_nm,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,to_char(gujia_drc_dt,'yyyy-mm-dd') as gujia_drc_dt,gujia_bds_drc_prc,gujia_add_psn,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_guided_price_gj_h where urbn_id='${cityCode}'"; + def sql = "select gujia_fsid,gujia_bds_id,comm_nm,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,to_char(gujia_drc_dt,'yyyy-mm-dd') as gujia_drc_dt,gujia_bds_drc_prc,gujia_add_psn,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from base.t0831_guided_price_gj_h where urbn_id='${cityCode}'"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_fsid @@ -227,7 +230,7 @@ class ExportAllPgData { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_bds_drc_prc, gujia_bds_drc_prc_src, rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_community_guide_price_gj_h where urbn_id='${cityCode}'"; + def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_bds_drc_prc, gujia_bds_drc_prc_src, rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from base.t0831_community_guide_price_gj_h where urbn_id='${cityCode}'"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_fsid @@ -307,7 +310,7 @@ class ExportAllPgData { def exportCommunityStaging() { def allRows = [] - def sql = "select gujia_instm_id,gujia_comm_id,gujiacomm_prim_prd_id,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_community_staging_gj_h"; + def sql = "select gujia_instm_id,gujia_comm_id,gujiacomm_prim_prd_id,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from base.t0831_community_staging_gj_h"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.gujia_instm_id @@ -330,7 +333,7 @@ class ExportAllPgData { def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - def sql = "select urbn_id,gujia_comm_id,gujia_bld_tp_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_data_tm_val from "+database+".t0831_bigdata_commbuildtype_gj_h where urbn_id='${cityCode}'"; + def sql = "select urbn_id,gujia_comm_id,gujia_bld_tp_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_data_tm_val from base.t0831_bigdata_commbuildtype_gj_h where urbn_id='${cityCode}'"; pgsqlInstance.eachRow(sql, { r -> def data = [] data << r.urbn_id @@ -363,12 +366,12 @@ class ExportAllPgData { def allRows = [] if(new_dists) { def newstr = "('"+new_dists.join("','")+"')" - def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " + + def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where " + "urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr} "; def rets1 = getThirdPartyDatas(sql1) allRows.addAll(rets1) - def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " + + def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where " + "urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} "; def rets2 = getThirdPartyDatas(sql2) allRows.addAll(rets2) @@ -424,17 +427,17 @@ class ExportAllPgData { if(new_dists){ def newstr = "('"+new_dists.join("','")+"')" def sql1 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + - "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}" + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}" def rets1 = dealData(sql1) def sql2 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + - "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" def rets2 = dealData(sql2) allRows.addAll(rets1) allRows.addAll(rets2) }else{ def sql = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + - "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}'"; + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}'"; allRows.addAll(dealData(sql)) } } @@ -535,7 +538,7 @@ class ExportAllPgData { if(new_dists){ def newstr = "('"+new_dists.join("','")+"')" def sql1 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + - "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}"; + "from base.t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}"; def rets1 = getHouseDatas(sql1) allRows.addAll(rets1) }else{ @@ -560,7 +563,7 @@ class ExportAllPgData { if(new_dists){//补充被修区域的数据 def newstr = "('"+new_dists.join("','")+"')" def sql2 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + - "from "+database+".t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" + "from base.t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" def rets2 = getHouseDatas(sql2) if(rets2.size()>0){ FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true); 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 ed89f59ac..9ed8300cc 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,9 +61,9 @@ 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) -// districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) +// cityRun(citys, startDate, endDate, cityCodeMap) +// regionRun(citys, startDate, endDate, cityCodeMap) + districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) } def cityRun(citys, startDate, endDate, cityCodeDataMap){ 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 ae9f4f058..c8d486778 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 @@ -1184,15 +1184,15 @@ class ExportDistrictRongHe extends BaseBatch{ } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMM_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMM_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = [] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); - println "COMMUNITY_BASE_PRICE_GJNB 数据文件输出完成......" + println "COMMUNITY_BASE_PRICE_GJ 数据文件输出完成......" CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "COMMUNITY_BASE_PRICE_GJNB 上传Ftp完成......" + println "COMMUNITY_BASE_PRICE_GJ 上传Ftp完成......" } @@ -1273,9 +1273,9 @@ class ExportDistrictRongHe extends BaseBatch{ def exportPgCommunityPdescribeGj(month){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMM_DESCRIBE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + fileName = "D:\\数据\\建行\\房产估值\\数据文件\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMM_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] def allRows = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy index a009eb954..66f7dd391 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/FumingTest.groovy @@ -31,9 +31,9 @@ class FumingTest { def path = "D:\\数据\\富民\\富民测试500-v7.xlsx" // match(path) // addPrice(path) -// addThirdPrice(path) + addThirdPrice(path) // addLastPrice(path) - addFacLevel(path) +// addFacLevel(path) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy index 2b163d322..25560ff03 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy @@ -40,19 +40,26 @@ class HailanTest { static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com") + static main(args) { def task = new HailanTest(); task.run(); } def run(){ - def inputfile = "D:\\数据\\海南\\统计.xlsx" + def inputfile = "D:\\数据\\微元素\\排查表-价格对比-新.xlsx" +// addThirdPrice(inputfile) // match(inputfile) +// tradeAvgPrice(inputfile) +// caluateTotalPrice(inputfile) // addPrice(inputfile) // addCommId("D:\\数据\\海南\\匹配上的合并数据.xlsx") // addHouse(inputfile) // stat(inputfile) - hailanStat(inputfile) +// hailanStat(inputfile) +// addFzFjwPrice(inputfile) + addFjwTobPrice(inputfile) } def addHouse(inputfile){ @@ -533,13 +540,13 @@ class HailanTest { def match(path){ ExcelUtils.multiThreadingModify(path, { row -> - if(row['C']){ - String city = row['H']//RegionData.formatCity(row['B']) + if(row['A']){ + String city = "福州"//RegionData.formatCity(row['B']) if(city){ - def address = row['C'] + def address = row['A'] // def region = row['C'] println "[match] city:"+city+" address:"+address - def jsonObject = OpenApiClient.addressMatch(city, address, "property", false, null, row['E']) + def jsonObject = OpenApiClient.addressMatch(city, address, "property", false, null, null) if(jsonObject != null && jsonObject.precise!=-1) { row['I'] = jsonObject.get("district") row['J'] = jsonObject.get("name") @@ -554,6 +561,8 @@ class HailanTest { }) } + + def stat(path){ ExcelUtils.modify(path, { row -> if(row['L'] && !row['H']){ @@ -700,4 +709,72 @@ class HailanTest { } return prices; } + + def tradeAvgPrice(inputfile){ + ExcelUtils.modify(inputfile, { row -> + if(row['I'] && row['I'] == "4f4dac0a84ae1852a920ad39"){ + def dist = CommonDatautils.findDistrictById(row['I']) + if(dist){ + def tradeAvgPrice = CommonDatautils.findTrades(dist, "2023-02-01", "2023-06-01"); + row['J'] = (int)tradeAvgPrice + } + } + }) + } + + + def addThirdPrice(path){ + def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")) //202302 + def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 + + + ExcelUtils.multiThreadingModify(path, { row -> + def cityMap = CommonDatautils.findThirdPartyPrice("福州", row['F'], row['G'], startDate, endDate) + def priceMap = cityMap.get("福州"+"##"+row['F']+"##"+row['G']) + if(priceMap){ + if(priceMap.containsKey("lianjia_esf_price")){ + row['K'] = (int)(priceMap.get("lianjia_esf_price")*0.95) + } + } + }) + } + + def caluateTotalPrice(inputfile){ + ExcelUtils.multiThreadingModify(inputfile, { row -> + if(row['J']){ + row['L'] = (int)(row['J'].toString().toDouble()*row['B'].toString().toDouble()) + }else if(row['K']){ + row['L'] = (int)(row['K'].toString().toDouble()*row['B'].toString().toDouble()) + } + }) + } + + + def addFjwTobPrice(path){ + ExcelUtils.multiThreadingModify(path,{d-> + if(d['F']){ + def dbo = CommonDatautils.queryDistrictPrice("福州", d['F'], d['G'], DateUtils.parseFromTightByPattern("2023-07-02","yyyy-MM-dd")) + if(dbo){ + d['Q'] = dbo.avg_price_2b + } + } + }) + } + + def addFzFjwPrice(inputfile){ + ExcelUtils.modify(inputfile, { row -> + if(row['B']) { + def q = new BasicDBObject() + q.put("city", "福州") + q.put("region", row['A']) + q.put("name", row['B']) + q.put("month", 202304) + def obj = FZ_DISTRICT_STAT_COLL.findOne(q) + if (obj) { + row['D'] = obj.avg_price + } + } + + }) + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocTest.groovy index 29a2403b5..a596bbb54 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/PocTest.groovy @@ -20,6 +20,25 @@ class PocTest { static main(args) { def task = new PocTest(); task.run(); +// task.export() + } + + def export(){ + ExcelUtils.modify("D:\\数据\\其它\\广州.xlsx", { row -> + def dist = CommonDatautils.findDistrictById(row["B"]) + row['F'] = dist.address + row['G'] = dist.lng/10000000000.0 + row['H'] = dist.lat/10000000000.0 + row['I'] = dist.estate_type2 + row['J'] = dist.build_type + row['K'] = dist.schools + row['L'] = dist.kindergartens + row['M'] = dist.loudong_count + row['N'] = dist.household_count + row['O'] = dist.estate_charge + row['P'] = dist.finish_building_date + row['Q'] = dist.estate_company + }) } @@ -32,9 +51,10 @@ class PocTest { * @return */ def run(){ - def inputfile = "D:\\数据\\重庆农商行\\poc\\test.xls" +// def inputfile = "D:\\数据\\重庆农商行\\poc\\test.xls" + def inputfile = "D:\\数据\\其它\\广州.xlsx" // match(inputfile) -// addPrice(inputfile) + addPrice(inputfile) // addArroundPrice(inputfile) // standard(inputfile) // addLoudongNum(inputfile) @@ -132,15 +152,16 @@ class PocTest { def addPrice(path){ ExcelUtils.multiThreadingModify(path, { row -> - def commid = row['R'] + def commid = row['B'] if(commid){ def dist = CommonDatautils.findDistrictById(commid.trim()) if(dist){ - row['Q'] = dist.name +// row['Q'] = dist.name def priceObj = CommonDatautils.findDistrictPrice(dist.city, dist.region, dist.name) if(priceObj){ - row['F'] = priceObj.avg_price + row['R'] = priceObj.avg_price } + row['S'] = CommonDatautils.findNewSqmetreRent(dist.city, dist.region, dist.name) } } }) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy new file mode 100644 index 000000000..2d862b119 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/RuiFenPocTest.groovy @@ -0,0 +1,197 @@ +package com.fangjia.script.chongqing + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.fangjia.script.util.OpenApiClient +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import groovy.sql.Sql + +class RuiFenPocTest { + + def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")) //202302 + def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 + + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + + static main(args) { + def task = new RuiFenPocTest(); + task.run(); + } + + def run(){ + def inputfile = "D:\\数据\\瑞丰\\房产信息-地址V3-1.xlsx" +// match(inputfile) +// addValue(inputfile) + +// addThirdPrice(inputfile) + lastPrice(inputfile) + } + + + def lastPrice(inputfile){ + ExcelUtils.multiThreadingModify(inputfile, { row -> + if(!row['X'] && row['S']){ + def mod = java.lang.Math.abs((row['S'].toString().toDouble()-row['H'].toString().toDouble())*100/row['H'].toString().toDouble()) + if(mod <= 10){ + row['U'] = row['H'] + }else{ + row['U'] = row['S'] + } + }else{ + if(row['K']){ + row['U'] = row['K'] + }else{ + row['U'] = row['H'] + } + + } + }) + } + + def addThirdPrice(path){ + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + + ExcelUtils.multiThreadingModify(path, { row -> + def cityMap = findThirdPartyPrice(row['D'], row['E'], row['F']) + def priceMap = cityMap.get(row['D']+"##"+row['E']+"##"+row['F']) + if(priceMap){ + if(priceMap.containsKey("lianjia_esf_price")){ + row['L'] = priceMap.get("lianjia_esf_price") + } + + if(priceMap.containsKey("beike_esf_price")){ + row['M'] = priceMap.get("beike_esf_price") + } + + if(priceMap.containsKey("anjuke_esf_price")){ + row['N'] = priceMap.get("anjuke_esf_price") + } + } + def map = findAvgPrice(row['I'], cityCodeMap.get(row['D'])) + if(map){ + row['O'] = map.avg_price + row['P'] = map.credit_value + } + }) + } + + + + def addValue(inputfile){ + ExcelUtils.multiThreadingModify(inputfile, { row -> + def dist = CommonDatautils.findDistrictById(row['I']) + if(dist){ + row["D"] = dist.city + row["E"] = dist.region + row["F"] = dist.name + row["G"] = dist.address + def priceObj = CommonDatautils.findDistrictPrice(dist.city, dist.region, dist.name) + if(priceObj){ + row['H'] = priceObj.avg_price + row['K'] = priceObj.avg_price_2b + } + } + }) + } + + + def match(path) { + ExcelUtils.multiThreadingModify(path, { row -> + def city = "绍兴" + if (row['B'] && !row["D"]) { + def address = row['B'] + println "[match] city:" + city + " address:" + address + def jsonObject = OpenApiClient.addressMatch(city, address, "property", false, null, null) + + if(!row["D"]){ + if (jsonObject != null && jsonObject.precise != -1) { + row["D"] = jsonObject.city + row["E"] = jsonObject.district + row["F"] = jsonObject.name + row["G"] = jsonObject.address + row["I"] = jsonObject.id + def priceObj = CommonDatautils.findDistrictPrice(jsonObject.city, jsonObject.district, jsonObject.name) + if(priceObj){ + row['H'] = priceObj.avg_price + } + } + }else { + if (jsonObject != null && jsonObject.precise != -1) { + if(row['J']){ + def str = jsonObject.city + " " + jsonObject.district + " " + jsonObject.name + " " + jsonObject.address + " " + jsonObject.id + row['K'] = str + }else{ + def str = jsonObject.city + " " + jsonObject.district + " " + jsonObject.name + " " + jsonObject.address + " " + jsonObject.id + row['J'] = str + } + } + } + } + }) + } + + def findThirdPartyPrice(def city, def region, def name){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("name", name) + q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) + + def dbcursor = AVERAGE_STATISTICS.find(q).sort(new BasicDBObject("s_date", -1)) + def map = [:] + for(def db : dbcursor){ + def key = db.city+"##"+db.region+"##"+db.name + def dataMap = map.get(key) + if(!dataMap){ + dataMap = [:] + map.put(key, dataMap) + } + + if(!dataMap.containsKey("anjuke_esf_price") && db.anjuke_esf_price && db.anjuke_esf_price>3000){ + dataMap.put("anjuke_esf_price", db.anjuke_esf_price) + } + if(!dataMap.containsKey("anjuke_esf_price") && db.get("58tc_esf_price") && db.get("58tc_esf_price")>3000){ + dataMap.put("anjuke_esf_price", db.get("58tc_esf_price")) + } + + if(!dataMap.containsKey("lianjia_esf_price") && db.lianjia_esf_price && db.lianjia_esf_price>3000){ + dataMap.put("lianjia_esf_price", db.lianjia_esf_price) + } + if(!dataMap.containsKey("cityhouse_esf_price") && db.cityhouse_esf_price && db.cityhouse_esf_price>3000){ + dataMap.put("cityhouse_esf_price", db.cityhouse_esf_price) + } + + if(!dataMap.containsKey("beike_esf_price") && db.beike_esf_price && db.beike_esf_price>3000){ + dataMap.put("beike_esf_price", db.beike_esf_price) + } + } + return map + } + + def findAvgPrice(def commid, def cityid){ + def sql = "SELECT gujia_bds_clc_avprc,gujia_bds_clmtd,gujiabds_clc_yrmo_val,gujia_bds_cfdc_dgr from t_app_p9pha_plda.avm_community_base_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${commid}' order by gujiabds_clc_yrmo_val desc limit 1" + def map = [:] + pgsqlInstance.eachRow(sql, { r -> + map.avg_price = r.gujia_bds_clc_avprc + map.type = r.gujia_bds_clmtd + map.month = r.gujiabds_clc_yrmo_val + map.credit_value = r.gujia_bds_cfdc_dgr + if(r.gujia_bds_clmtd == 1){ + map.calc_type = "人工估值" + }else if(r.gujia_bds_clmtd == 2){ + map.calc_type = "样本计算" + }else if(r.gujia_bds_clmtd == 3){ + map.calc_type = "神经网络" + } + }) + return map + } + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index 767b0b48a..5102257a3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -1,11 +1,14 @@ package com.fangjia.script.commData +import com.fangjia.core.RegionData import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils import groovy.json.JsonSlurper import net.sf.json.JSONArray import net.sf.json.JSONObject - +import org.apache.commons.lang.StringUtils import org.bson.types.ObjectId import com.fangjia.core.util.HttpRequest; @@ -23,6 +26,12 @@ import com.mongodb.DBCollection import com.mongodb.DBCursor import com.mongodb.DBObject import com.mongodb.QueryOperators +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +import java.util.regex.Matcher +import java.util.regex.Pattern class CommonDatautils { @@ -75,6 +84,17 @@ class CommonDatautils { public static final DBCollection DISTRICT_ANALY_DATA_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com") + + static def DIRECTIONS = ["东北", "西北", "东南", "西南", "南北", "东西", "东", "南", "西", "北"] + private static final HashMap> FITMENTS_TYPES_MAPS = new HashMap>() + static{ + FITMENTS_TYPES_MAPS.put("毛坯", ["毛坯", "清水", "无装修", "独栋毛坯", "毛胚", "白坯", "旧装", "坯", "原房", "毛坏"]) + FITMENTS_TYPES_MAPS.put("简装", ["简装", "普通装修", "普通", "简单装修", "简易装修", "普装", "一般装修", "一般", "简", "粗装修"]) + FITMENTS_TYPES_MAPS.put("精装", ["精装", "全装修", "全装", "中等装修", "中装", "中档装修", "精致装修", "中档", "中等", "精", "中修", "优质装修", "时尚装修", "良装", "中高挡"]) + FITMENTS_TYPES_MAPS.put("豪装", ["豪华装修", "高档", "豪华", "豪装", "高级装修", "高装", "奢侈"]) + } + + public static DSCollection getHouseDataStoreConnection(){ if(house_dataStoreConnection != null) { return house_dataStoreConnection @@ -232,7 +252,6 @@ class CommonDatautils { q.put("visible", 0); q.put("cat", cat); q.put("city", city); -// q.put("name", "长滩美墅三期") DBObject keys = new BasicDBObject(); if(fields){ @@ -250,12 +269,38 @@ class CommonDatautils { } - public static def findRemoveDistricts(def city, def cat, def fields, def m_date){ + public static def findAllUpdateDistricts(def city, def cat, def fields, def startMdate, def endMdate){ + DBObject q = new BasicDBObject(); + q.put("visible", 0); + q.put("cat", cat); + q.put("city", city); + q.put("m_date", new BasicDBObject('$gte', startMdate).append('$lt', endMdate)) + + DBObject keys = new BasicDBObject(); + if(fields){ + for(def field : fields){ + keys.put(field, 1); + } + } + + DSCursor cursor = getDataStoreConnection().find(q, keys).batchSize(2000) + List rets = [] + for(def obj : cursor){ + println obj.name +" "+obj.m_date + rets << obj + } + return rets; + } + + public static def findRemoveDistricts(def city, def cat, def fields, def startDate, def endDate){ DBObject q = new BasicDBObject(); q.put("status", 1); q.put("cat", cat); q.put("city", city); - q.put("m_date", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(m_date))) + if(startDate){ + q.put("m_date", new BasicDBObject('$gte', startDate).append('$lt',endDate)) + } + DBObject keys = new BasicDBObject(); if(fields){ for(def field : fields){ @@ -719,8 +764,9 @@ class CommonDatautils { public static def findAllDistrict(def cat, def fields){ DBObject q = new BasicDBObject(); - q.put("visible",0) + q.put("status",0) q.put("cat", cat); +// q.put("name", "中兴智汇大厦") DBObject keys = new BasicDBObject(); if(fields){ @@ -728,7 +774,8 @@ class CommonDatautils { keys.put(field, 1); } } - def dbsour = getDataStoreConnection().find(q, keys).batchSize(2000) + def dbsour = DbUtils.seaweed.find(q, keys).batchSize(2000) +// def dbsour = getDataStoreConnection().find(q, keys).batchSize(2000) def rets = [] for(def d : dbsour){ rets << d @@ -877,28 +924,28 @@ class CommonDatautils { DBObject q = new BasicDBObject(); q.put("_id", new ObjectId(id.toString().replace("[","").replace("]",""))); - DBObject keys = new BasicDBObject(); - keys.put("alias", 1); - keys.put("addr_alias", 1); - keys.put("city", 1); - keys.put("region", 1); - keys.put("name", 1); - keys.put("estate_type2", 1); - keys.put("address", 1); - keys.put("build_structure", 1); - keys.put("out_pics", 1); - keys.put("lat", 1); - keys.put("lng", 1); - keys.put("lat2", 1); - keys.put("lng2", 1); - keys.put("name_cat", 1); - keys.put("finish_building_date", 1) - keys.put("mapping_alias", 1) - keys.put("sid", 1) - keys.put("status", 1) - keys.put("name_cat", 1) +// DBObject keys = new BasicDBObject(); +// keys.put("alias", 1); +// keys.put("addr_alias", 1); +// keys.put("city", 1); +// keys.put("region", 1); +// keys.put("name", 1); +// keys.put("estate_type2", 1); +// keys.put("address", 1); +// keys.put("build_structure", 1); +// keys.put("out_pics", 1); +// keys.put("lat", 1); +// keys.put("lng", 1); +// keys.put("lat2", 1); +// keys.put("lng2", 1); +// keys.put("name_cat", 1); +// keys.put("finish_building_date", 1) +// keys.put("mapping_alias", 1) +// keys.put("sid", 1) +// keys.put("status", 1) +// keys.put("name_cat", 1) try{ - DSCursor cursor = getDataStoreConnection().find(q, keys); + DSCursor cursor = getDataStoreConnection().find(q); if(cursor){ for(def obj : cursor){ return obj; @@ -1004,7 +1051,7 @@ class CommonDatautils { q.put("cat", cat); q.put("region", region) q.put("name", name); - q.put("status", 0) + q.put("visible", 0) DBObject keys = new BasicDBObject(); if(fields){ @@ -3518,5 +3565,381 @@ class CommonDatautils { def analyData = DISTRICT_ANALY_DATA_COLL.findOne(q) return analyData } - + + static def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(false).includeUpper(false); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)) + .must(date_range).must(area_range) + if(cat){ + queryBuilder.must(QueryBuilders.termQuery("cat", cat)) + } + + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + + + def rets = [] + def hosts = ["192.168.0.206","192.168.0.211","192.168.0.212","192.168.0.213","192.168.0.214","192.168.0.215"] + def index = new Random().nextInt(5); + + def houses = ElasticUtils.executeSimpleQuery(hosts[index], "seawater-20*", queryBuilder); + + if(houses){ + for (int k=0;k60){ + continue; + } + + + if(seawater.room){ + if(seawater.room>=11 || seawater.room<1){ + continue; + } + } + + if(!seawater.hall){ + seawater.hall = null + } + if(seawater.hall && (seawater.hall>=5 || seawater.hall<1)){ + continue; + } + if(!seawater.toilet){ + seawater.toilet = null + } + if(seawater.toilet && (seawater.toilet>=5 || seawater.toilet<1)){ + continue; + } + + def floor = parseFloor(seawater.floor_info) + if(seawater.height && floor && floor.isNumber()){ + if(floor.toInteger()>seawater.height){ + floor = null + seawater.height = null + } + } + + if(!floor){ + seawater.floor = null + } + if(floor && floor.toInteger()<1){ + floor = null + } + + def rowMap = [:]; + + rowMap.houseId = seawater.id + rowMap.area = seawater.area + rowMap.address = seawater.address + rowMap.total_price = seawater.total_price + rowMap.avg_price = seawater.avg_price + rowMap.build_type = seawater.build_type + rowMap.build_date = seawater.build_date + rowMap.district_name = seawater.district_name + rowMap.height = seawater.height=="null"?null:seawater.height + if(rowMap.height && rowMap.height<1){ + rowMap.height = null + } + rowMap.floor = floor=="null"?null:floor + rowMap.room = seawater.room=="null"?null:seawater.room + rowMap.hall = seawater.hall=="null"?null:seawater.hall + rowMap.toilet = seawater.toilet=="null"?null:seawater.toilet + + def direction = parseDirection(seawater.direction) + rowMap.direction = direction=="null"?null:direction + + def fitment = parseFitment(seawater.fitment) + rowMap.fitment = fitment=="null"?null:fitment + + if(seawater.p_date instanceof String){ + seawater.p_date = seawater.p_date.toInteger() + } + + rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss") + rowMap.c_date = DateUtils.getConverDate(seawater.m_date) + rowMap.m_date = DateUtils.getConverDate(seawater.m_date) + + rets << rowMap + } + } + return rets; + } + + static def parseFloor(def floorDesc){ + if(floorDesc){ + floorDesc = floorDesc.replaceAll("[\\s ]+", "") + if(floorDesc){ + Pattern pat1 = Pattern.compile("第(\\d{1,2})层"); + Matcher matcher1 = pat1.matcher(floorDesc); + if (matcher1.find()) { + return matcher1.group(1) + } + pat1 = Pattern.compile("(\\d{1,2})层?(/|\\()共?\\d{1,2}(层|F)?"); + matcher1 = pat1.matcher(floorDesc); + if (matcher1.find()) { + return matcher1.group(1) + } +// if(floorDesc.contains("中楼层") || floorDesc.contains("中层")){ +// return "中层" +// } +// +// if(floorDesc.contains("高楼层") || floorDesc.contains("高层")){ +// return "高层" +// } +// +// +// if(floorDesc.contains("低楼层") || floorDesc.contains("低层")){ +// return "低层" +// } + if(floorDesc.isNumber()){ + return floorDesc; + } + } + } + return null; + } + + static String parseDirection(String directionDesc) { + if (directionDesc == null) { + return null + } + directionDesc = directionDesc.replaceAll("(\\(|(|《|\"|“|【|〔).+?(\\)|》|)|\"|”|】|〕)", "#_#") + StringBuffer sb = new StringBuffer() + for (int i = 0; i < directionDesc.length(); i++) { + String c = directionDesc.substring(i, i + 1) + if (DIRECTIONS.contains(c)) { + if (directionDesc.substring(i).startsWith(c + "#_#")) { + sb.append(c + " ") + } else { + sb.append(c) + } + } + } + for (String d : DIRECTIONS) { + if (sb.toString().startsWith(d)) { + return d + } + } + for (String d : DIRECTIONS) { + if (sb.toString().contains(d)) { + return d + } + } + return null + + } + + static String parseFitment(String fitmentDesc) { + if (fitmentDesc == null) { + return null + } + fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") + if (fitmentDesc.equals("非毛坯")) { + return null + } + Iterator>> it = FITMENTS_TYPES_MAPS + .entrySet().iterator() + Map.Entry> entry + while (it.hasNext()) { + entry = it.next() + if (fitmentDesc.contains(entry.getKey())) { + return entry.getKey() + } + for (String fitmentKey : entry.getValue()) { + if (fitmentDesc.contains(fitmentKey)) { + return entry.getKey() + } + } + } + return null + + } + + /** + * 是否是别墅 + * @return + */ + public boolean isVilla(area, name, height, room) { + if (area == null) { + return false; + } + if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) { + return true; + } + + boolean ret = false; + if (height != null && room != null) { + if (height <= 3) { + if (area > 200 && room >= 5) { + ret = true; + } + } + } else if (height == null && room != null) { + if (area > 360 && room >= 6) { + ret = true; + } + } else if (height == null && room == null) { + if (area > 500) { + ret = true; + } + } + + return ret; + } + + + static def findTrades(dist, startDate, endDate){ + def q = new BasicDBObject() + q.put("city", dist.city) + q.put("region", dist.region) + + if(dist.alias){ + if(!dist.alias.contains(dist.name)){ + dist.alias << dist.name + } + q.put("district_name", new BasicDBObject('$in', dist.alias)) + }else{ + q.put("district_name", dist.name) + } + + q.put("trade_date", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(startDate)).append('$lt',DateUtils.parseFromTightYYYYMMDD(endDate))) + def dbcorsor = DEAL_PRICE_COLL.find(q) + def avg_price = 0 + def total_price = 0 + def count = 0 + + for(def d : dbcorsor){ + if(d.avg_price){ + total_price = total_price + d.avg_price + count++ + } + } + if(count > 3){ + avg_price = total_price/count + } + return avg_price + } + + static def findThirdPartyPrice(def city, def region, def name, def startDate, def endDate){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("name", name) + q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) + def dbcursor = thirdpartColl.find(q).sort(new BasicDBObject("s_date", -1)) + def map = [:] + for(def db : dbcursor){ + def key = db.city+"##"+db.region+"##"+db.name + def dataMap = map.get(key) + if(!dataMap){ + dataMap = [:] + map.put(key, dataMap) + } + + if(!dataMap.containsKey("anjuke_esf_price") && db.anjuke_esf_price && db.anjuke_esf_price>3000){ + dataMap.put("anjuke_esf_price", db.anjuke_esf_price) + } + if(!dataMap.containsKey("anjuke_esf_price") && db.get("58tc_esf_price") && db.get("58tc_esf_price")>3000){ + dataMap.put("anjuke_esf_price", db.get("58tc_esf_price")) + } + + if(!dataMap.containsKey("lianjia_esf_price") && db.lianjia_esf_price && db.lianjia_esf_price>3000){ + dataMap.put("lianjia_esf_price", db.lianjia_esf_price) + } + if(!dataMap.containsKey("cityhouse_esf_price") && db.cityhouse_esf_price && db.cityhouse_esf_price>3000){ + dataMap.put("cityhouse_esf_price", db.cityhouse_esf_price) + } + + if(!dataMap.containsKey("lianjia_esf_price") && db.beike_esf_price && db.beike_esf_price>3000){ + dataMap.put("lianjia_esf_price", db.beike_esf_price) + } + } + return map + } + + + /** + * 根据经纬度获取区域 + * @param city + * @param location + * @return + */ + static def getRegionByLocation(city, def location){ + def json = GaoDeApiUtils.geocode(location); + def region = null; + if (json && json.info=="OK") { + def regeocode = json.regeocode + if(regeocode && regeocode.addressComponent){ + region = regeocode.addressComponent.district + if(!region){ + region = regeocode.addressComponent.township + } + } + } + if(region){ + region = RegionData.formatRegion(city, region) + } + return region; + } + + def static getAllFiles(def path) { + + File file = new File(path); + File[] tempList = file.listFiles(); + + def files = []; + for (int i = 0; i < tempList.length; i++) { + if (tempList[i].isFile()) { + files << tempList[i]; + } + if (tempList[i].isDirectory()) { + System.out.println("文件夹:" + tempList[i]); + } + } + return files; + } + + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/DataHandleUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/DataHandleUtils.groovy index 7fe3204dd..5edea094e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/DataHandleUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/common/DataHandleUtils.groovy @@ -250,8 +250,23 @@ class DataHandleUtils { return sum; } - - - + + + public static isStandardRoad(def s){ + def pattern = Pattern.compile("[路|街道|大道|巷|胡同|街|坊]\\d+(-\\d+)?(号|弄)"); + def matcher = pattern.matcher(s) + if(matcher.find()){ + return true; + } + return false + } + + + + + static main(args) { + def a = isStandardRoad("杨桥西路236号") + println a + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy new file mode 100644 index 000000000..530d8b36d --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/district/MasterNameInAlias.groovy @@ -0,0 +1,59 @@ +package com.fangjia.script.district + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.GeoUtils +import com.mongodb.BasicDBObject +//删除别名是另一个小区的主名 +class MasterNameInAlias { + + static main(args) { + def task = new MasterNameInAlias() + task.run() + } + + def run(){ + def citys = CommonDatautils.findAllCity().reverse() + def allList = [] + for(def city : citys){ + def disticts = CommonDatautils.findAllDistricts(city, "district", ["city","region","name","address","alias","estate_type2", "lat", "lng"]) + + def cityList = [] + cityList << ["城市","区域","名称","物业类型","地址","别名", "距离", "地址状态"] + for(def dist1 : disticts){ + def distList = [] + for(def dist2 : disticts){ + if(dist1._id && dist2._id && dist1._id.toString()!=dist2._id.toString()){ + if(dist2.alias && dist2.alias.contains(dist1.name)){ + def distance = '' + if(dist1.lng && dist2.lng){ + distance = com.fangjia.core.util.GeoUtils.calculateDistance(dist1.lng/10000000000d, dist1.lat/10000000000d, dist2.lng/10000000000d, dist2.lat/10000000000d); + } + distList << [dist2.city, dist2.region, dist2.name, dist2.estate_type2, dist2.address, dist2.alias?dist2.alias.join(' '):'', distance] + dist2.alias.remove(dist1.name) + def d = new BasicDBObject() + d.put("_id", dist2._id) + + def udata = new BasicDBObject() + udata.put("alias", dist2.alias) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(d, new BasicDBObject('$set', udata)) + } + } + } + if(distList){ + cityList << [dist1.city, dist1.region, dist1.name, dist1.estate_type2, dist1.address, dist1.alias?dist1.alias.join(' '):'', ''] + cityList.addAll(distList) +// cityList << [] + } + } + + if(cityList){ + allList.addAll(cityList) + println city +" "+cityList.size() + } + } +// ExcelUtils.write("d:\\数据\\小区\\主名在别名中.xlsx", allList, "数据") + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtResponseTimeAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtResponseTimeAnaly.groovy index 5c1e8c152..58a433b62 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtResponseTimeAnaly.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fangjiatong/FjtResponseTimeAnaly.groovy @@ -35,7 +35,7 @@ class FjtResponseTimeAnaly extends BaseBatch{ @Override public void process(Object args) { //run(); - jms.sendMail("gaojuan@fangjia.com", "测试发邮件", "收到了?") + jms.sendMail("gaojuan@fangjia.com", "测试发邮件", "收到了2?") } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/AmapAddressUpdate.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/AmapAddressUpdate.groovy new file mode 100644 index 000000000..cecc0536d --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/AmapAddressUpdate.groovy @@ -0,0 +1,616 @@ +package com.fangjia.script.fuzhou + +import com.fangjia.core.util.BaiDuApiUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.gj.EsUtils +import com.fangjia.script.gj.district.FangjiaClientUtils +import com.fangjia.script.linxsh.util.AddressUtil +import com.fangjia.script.looplineinfo.InsidePolygon +import com.fangjia.script.util.CosineSimilarAlgorithm +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.OpenApiClient +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils +import com.mongodb.BasicDBObject +import org.elasticsearch.xpack.sql.jdbc.EsDataSource + +import java.sql.ResultSet +import java.sql.ResultSetMetaData +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + +class AmapAddressUpdate { + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static EsDataSource dataSource = new EsDataSource() + private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200?timezone=UTC&page.size=240&connect.timeout=240000&network.timeout=60000&page.timeout=240000&query.timeout=90000" + static { + dataSource.setUrl(address) + Properties connectionProperties = new Properties() + connectionProperties.put("user", "developer") + connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") + dataSource.setProperties(connectionProperties) + } + + static main(args) { + def task = new AmapAddressUpdate() + def path = "d:\\数据\\小区\\福州小区地址与高德地图V2.xlsx" + def addr = task.formatAddress("福州", "北三环路201号") + println addr +// task.run(path) +// task.similarMatch(path) +// task.addressRun(path) +// task.addressSource(path) +// task.amapRun() + +// task.addrAndLocationDistance(path)//地址经纬度与库中经纬度比较 +// task.updateData(path) +// task.updateLocation(path)//更新经纬度 + } + def run(path){ + def citys = ["福州"]//CommonDatautils.findAllCity() + def allrets = [] + allrets << ["城市","区域","名称","地址","地址别名","高德区域","高德名称","高德地址","高德地址格式化","高德经度","高德纬度"] + for (def city : citys) { + def disticts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name","address", "addr_alias","lat", "lng"]) + def rets = findAmapDetail(disticts) + allrets.addAll(rets) + } + ExcelUtils.write(path, allrets, "数据") + } + + def amapRun(){ + def city = "福州市" + def datas = findAllAmapByCity(city) +// datas = datas[0..10] + println "Es总量:"+datas.size() + def rets = match(datas) + + ExcelUtils.write("d:\\数据\\小区\\福州高德数据匹配.xlsx", rets, "数据") + } + + def match(datas){ + def rets = Collections.synchronizedList(new ArrayList()); + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(datas.size()) + rets << ["ID","高德城市","高德区域","高德名称","高德地址","匹配城市","匹配区域","匹配名称","匹配类型","匹配ID"] + for(def i=0;i +// println data.adname+" "+data.name +" "+data.address +" "+data.type +// if(name == data.name && data.adname.contains(region) && data.type.contains("type")){ +// data.formatAddress = AddressUtil.formatAddress(city, data.address) +// loc = data +// } +// }) + return map; + } + + + + + + def addressRun(inputfile){ + + ExcelUtils.multiThreadingModify(inputfile, { row -> +// if(row['H'] && row['H'].contains("口步行") && row['H'].contains("(")){ +// row['I'] = row['H'].substring(0, row['H'].indexOf("(")) +// } + if(row['J']){ + def dist1 = CommonDatautils.findDistrict(row['A'], row['B'], row['C'], "district") + def distance = null + if(dist1){ + distance = com.fangjia.core.util.GeoUtils.calculateDistance(dist1.lng/10000000000d, dist1.lat/10000000000d, row['J'].toString().toDouble(), row['K'].toString().toDouble()); + } + row['M'] = distance + } + + def gaodeRoadFlag = false + if(row['I']){ + gaodeRoadFlag = DataHandleUtils.isStandardRoad(row['I']) + } + def dbRoadFlag = false + if(row['D']){ + dbRoadFlag = DataHandleUtils.isStandardRoad(row['D']) + } + if(!row['N'] && row['D'] && row['I']){ + if(row['D']==row['I']){ + row['N'] = 100 + }else if(row['E'] && gaodeRoadFlag && row['E'].contains(row['I'])){ + row['N'] = 1 + } + } + + if(!row['N'] && !dbRoadFlag && gaodeRoadFlag){ + row['N'] = 2 + } + + if(!row['N'] && dbRoadFlag && gaodeRoadFlag && row['I'].contains(row['D'])){ + row['N'] = 3 + } + + if(!row['N'] && dbRoadFlag && gaodeRoadFlag){ + row['N'] = 4 + } + + }) + } + + def addressSource(inputfile) { + + ExcelUtils.multiThreadingModify(inputfile, { row -> + if(!row['N'] && row['D'] && !row['O']){ + def addresses = findAllEsData(row['A'], row['B'], row['C']) + if(addresses){ + def dbRoadFlag = false + if(row['D']){ + dbRoadFlag = DataHandleUtils.isStandardRoad(row['D']) + } + if(dbRoadFlag){ + def list = [] + list << row['D'] + if(row['E']){ + def arr = row['E'].split(" ") + list.addAll(arr as List) + } + for(def addr : list){ + if(addresses.contains(addr)){ + row['O'] = "诸葛找房" + break + } + } + } + } + } + }) + } + + + def findAllEsData(city,region, name){ + def rets = [] + def sql = "select * from community where city='${city}' and name='${name}' and source='诸葛找房APP'" + rets = findDatas(region, sql) + if(!rets){ + rets = findAliasDatas(city,region, name) + } + return rets; + } + + def findDatas(region, sql){ + def rets = [] + ElasticUtils.executeSqlQuery(sql, { d-> + if(d.region && d.region.contains(region) && d.address){ + rets << d.address + } + }) + return rets; + } + + + def findAliasDatas(city, region, name){ + def must = [] + def term1 = ["match":["city":city]] + must << term1 + + def should = [] + should << ["match":["alias":name]] + def params = ["query":["bool":["must":must, "should":should]]] + def s = EsUtils.httpSaveData(params, "http://192.168.0.206:9200/community/_doc/_search"); + def rets = []; + if(s) { + def doc = new groovy.json.JsonSlurper().parseText(s) + def hits = doc.hits + if(hits){ + hits = hits.hits + for(def h : hits){ + def d = h._source + if(d.region && d.region.contains(region) && d.address && d.source=="诸葛找房APP"){ + rets << d.address + } + } + } + } + return rets; + } + + def addrAndLocationDistance(inputfile){ + ExcelUtils.multiThreadingModify(inputfile, { row -> + if(!row['N'] && row['D']){ + println row['D'] + def dbRoadFlag = false + if(row['D']){ + dbRoadFlag = DataHandleUtils.isStandardRoad(row['D']) + } + if(dbRoadFlag){ + def gloJson = GaoDeApiUtils.geo(row['A'], row['D']) + if(gloJson) { + def glocation = null + if (gloJson && gloJson.get("geocodes")) { + def geocodes = gloJson.get("geocodes") + def map = geocodes.get(0) + if(map.formatted_address.contains(row['D'])){ + def arrs = map.location.split(",") + + def dist1 = CommonDatautils.findDistrict(row['A'], row['B'], row['C'], "district") + def distance = null + if(dist1){ + distance = com.fangjia.core.util.GeoUtils.calculateDistance(dist1.lng/10000000000d, dist1.lat/10000000000d, arrs[0].toString().toDouble(), arrs[1].toString().toDouble()); + } + row['P'] = distance + } + } + } + } + } + }) + } + + def updateData(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['Q'] && row['Q'].contains("修改地址")){ + def dist1 = CommonDatautils.findDistrict(row['A'], row['B'], row['C'], "district") + def udata = new BasicDBObject() + if(row['Q'].contains("可替换原地址")){ + udata.put("address", row['I']) + }else if(row['Q'].contains("可新增地址别名")){ + udata.put("address", row['I']) + def addrAlias = dist1.addr_alias + if(!addrAlias){ + addrAlias = [] + } + addrAlias << dist1.address + udata.put("addr_alias", addrAlias) + } + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id', dist1.get("_id")), new BasicDBObject('$set', udata)) + } + + + + }) + } + + def updateLocation(path){ + ExcelUtils.multiThreadingModify(path, { row -> + + if(row['R'] && row['R']=="是"){ + def dist1 = CommonDatautils.findDistrict(row['A'], row['B'], row['C'], "district") + if(dist1){ + def udata = new BasicDBObject() + def lat = null + def lng = null + if(row['J']){ + lng = row['J'].toString().toDouble() + lat = row['K'].toString().toDouble() + }else{ + def gloJson = GaoDeApiUtils.geo(row['A'], row['D']) + if(gloJson) { + if (gloJson && gloJson.get("geocodes")) { + def geocodes = gloJson.get("geocodes") + def map = geocodes.get(0) + if (map.formatted_address.contains(row['D'])) { + def arrs = map.location.split(",") + lng = arrs[0].toString().toDouble() + lat = arrs[1].toString().toDouble() + } + } + } + } + + // 高德转百度 + def baidu = BaiDuApiUtils.geoconv(lng, lat, 3) + def lng2 = baidu.x + def lat2 = baidu.y + Long lng_new = lng *10000000000L + Long lat_new = lat *10000000000L + udata.put("lng", lng_new) + udata.put("lat", lat_new) + if(lng2){ + Long lng2_new = lng2 *10000000000L + Long lat2_new = lat2 *10000000000L + udata.put("lng2", lng2_new) + udata.put("lat2", lat2_new) + } + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id', dist1.get("_id")), new BasicDBObject('$set', udata)) + } + + } + + }) + } + + def similarMatch(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(!row['F']){ + def d = CommonDatautils.findDistrict(row['A'], row['B'], row['C'], "district") + if(d && d.lat){ + def dbo = getSimilarAmapLocation(d.city+"市", d.region, d.name, d.address, d.lat/10000000000.0, d.lng/10000000000.0) + if(dbo){ + row['F'] = dbo.region + row['G'] = dbo.name + row['H'] = dbo.address + row['I'] = formatAddress(d.city, dbo.address) + row['J'] = dbo.lng + row['K'] = dbo.lat + row['L'] = dbo.score + row['M'] = dbo.distance + row['S'] = dbo.type + } + } + } + + }) + } + + + + def getSimilarAmapLocation(city, region, name, address, lat, lng){ + + final StringBuffer sqlBuffer = new StringBuffer() + sqlBuffer.append("SELECT cityname,adname,name,address,type,location,m_date,typecode FROM amap_poi_detail WHERE 1=1") + sqlBuffer.append(" and cityname = '" + city + "'") + sqlBuffer.append(" and MATCH(name,'${name}')") + ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) + + def maxSocreObj = null + while (rs.next()) { + def map = [:] + def mapName = rs.getString("name").replace("·","") + + println name +" "+ mapName + if(rs.getString("adname").contains(region)){ + map.name = rs.getString("name") + map.address = rs.getString("address") + + map.region = rs.getString("adname") + map.type = rs.getString("type") + map.match_type = "名称相似" + def location = rs.getObject("location") + if(location){ + map.lng = location.x + map.lat = location.y + } + + double nameScore = 0 + double addScore = 0 + double loctionScore = 0 + def distance = com.fangjia.core.util.GeoUtils.calculateDistance(lng, lat, map.lng.toString().toDouble(), map.lat.toString().toDouble()); + map.distance = distance + if(map.name && name){ + nameScore = CosineSimilarAlgorithm.getSimilarity(map.name, name); + } + if(map.address && address){ + addScore = CosineSimilarAlgorithm.getSimilarity(map.address, address); + } + + if(hasColumn(rs, "shape")){ + def shape = rs.getObject("shape") + if(shape){ + def coordinates = shape.getObject("coordinates") +// def pointList = InsidePolygon.createPoint2(points); + def flag = InsidePolygon.isInArea(lng, lat, coordinates) + if(flag){ + loctionScore = 0.5 + } + } + }else{ + + if(distance < 500 && (nameScore>0.5 || addScore>0.5)){ + loctionScore = 0.3 + } + } + + def score = nameScore*0.3 + addScore*0.2 + loctionScore + map.score = score + if(!maxSocreObj){ + if(score>0){ + map.formatAddress = AddressUtil.formatAddress(city, map.address) + maxSocreObj = map + } + }else{ + println score +" "+maxSocreObj.score + if(maxSocreObj && score>maxSocreObj.score){ + map.formatAddress = AddressUtil.formatAddress(city, map.address) + maxSocreObj = map + } + } + } + } + return maxSocreObj; + } + + + def hasColumn(ResultSet rs, String columnName) { + ResultSetMetaData rsmd = rs.getMetaData(); + int columns = rsmd.getColumnCount(); + for (int x = 1; x <= columns; x++) { + if (columnName.equals(rsmd.getColumnName(x))) { + return true; + } + } + return false; + } + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy index 464ac2301..206e8c11a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictInfoExportBatch.groovy @@ -10,6 +10,7 @@ import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection import org.apache.commons.codec.digest.DigestUtils +import org.apache.commons.lang.StringUtils import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService @@ -24,7 +25,7 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class DistrictInfoExportBatch extends BaseBatch{ - def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); +// def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def charset = "GBK" @@ -40,6 +41,9 @@ class DistrictInfoExportBatch extends BaseBatch{ @Override void process(Object args) { + def curDate = Integer.parseInt(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")); + + def headers = ["id","city","district","name","lng","lat","property_type","build_type","households", "property_fee","car_site_count","property_life","house_property","open_date","finish_date", "delivery_date","floor_area","build_area","plot_ratio","landscaping_ratio","developer","property_company", @@ -73,31 +77,38 @@ class DistrictInfoExportBatch extends BaseBatch{ def createDatas(def city){ def result = [] - def distKeys = [] - def districts = CommonDatautils.findAllDistricts(city, "district", null); - for(def dist : districts){ - def key = dist.city +"##"+dist.region+"##"+dist.name - if(!distKeys.contains(key)){ - distKeys << key - } + def districts = null + + def day = new Date().getDate() + def startMDate = DateUtils.truncateDay(new Date()-1) + def endMDate = DateUtils.truncateDay(new Date()) + if(day == 15){ + districts = CommonDatautils.findAllDistricts(city, "district", null); + }else{ + districts = CommonDatautils.findAllUpdateDistricts(city, "district", null, startMDate, endMDate); } - def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01"); -// for(def dist : removeDists){ -// def key = dist.city +"##"+dist.region+"##"+dist.name -// if(!distKeys.contains(key)){ -// distKeys << key -// districts << dist -// } -// } + def lastDate = DateUtils.getLastDayOfMonth(new Date(), -1) - def startDate = DateUtils.getFirstDayOfMonth(lastDate); +// def startDate = DateUtils.getFirstDayOfMonth(lastDate); def fzAddrMap = getFzAddress(); //因为福州个性化问题,又不想影响自家数据库数据,所以另存一个福州小区库,用于手动添加数据 -// saveOrUpdateFzDist(districts) - remarkRemoveDist(removeDists) - def fzDistricts = getFzDistricts(city) + saveOrUpdateFzDist(districts) + + if(day == 15){ + def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, DateUtils.parseFromTightYYYYMMDD("2022-01-01"), endMDate); + remarkRemoveDist(removeDists) + }else{ + def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, startMDate, endMDate); + remarkRemoveDist(removeDists) + } + def fzDistricts = null + if(day==15){ + fzDistricts = getFzDistricts(city, null, null) + }else{ + fzDistricts = getFzDistricts(city, startMDate, endMDate) + } for(def rMap : fzDistricts){ //价格没有也提供 @@ -168,7 +179,6 @@ class DistrictInfoExportBatch extends BaseBatch{ udate.put(k,v) } udate.removeField("_id") - udate.put("m_date", new Date()) FZ_DIST_COLL.update(new BasicDBObject('_id',d.get('_id')), new BasicDBObject('$set', udate)); }else{ FZ_DIST_COLL.save(d) @@ -190,14 +200,17 @@ class DistrictInfoExportBatch extends BaseBatch{ for(def rd : removeDists){ def udate = new BasicDBObject() udate.put("status",1) - udate.put("m_date", new Date()) + udate.put("m_date", rd.m_date) FZ_DIST_COLL.update(new BasicDBObject('_id',rd.get('_id')), new BasicDBObject('$set', udate)); } } - def getFzDistricts(def city){ + def getFzDistricts(def city, def mdate, def endMDate){ def q = new BasicDBObject() q.put("city", city) + if(mdate){ + q.put("m_date", new BasicDBObject('$gte', mdate).append('$lt', endMDate)) + } def rets = [] FZ_DIST_COLL.find(q).each{it-> rets << it @@ -321,6 +334,7 @@ class DistrictInfoExportBatch extends BaseBatch{ def s = str.toString(); index++; if(s && s!="null"){ + s = s.replace('"','\\"') // if(s.toString().contains(",")){ // s = csvHandlerStr(s.toString()) // diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy index dd6f1e2dc..1e5037735 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit @BatchOwner(Watcher.GaoJuan) class DistrictPriceExportBatch extends BaseBatch{ - def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); +// def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def lastMonthDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM")); def charset = "GBK" @@ -33,7 +33,7 @@ class DistrictPriceExportBatch extends BaseBatch{ static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") - def specialDistsPriceMap = ["津泰新村7号、9-13号、15-17号":53620,"津泰新村14号":76230,"津泰新村1-6号、8号":32580] + def specialDistsPriceMap = ["津泰新村9-13号、15-18号":54000,"津泰新村14号":72000,"津泰新村1-6号、8号":35000,"津泰新村7号":75000,"津泰新村19号":25000] static main(args) { runBatch(new DistrictPriceExportBatch(), args) } @@ -41,6 +41,7 @@ class DistrictPriceExportBatch extends BaseBatch{ @Override void process(Object args) { + def curDate = Integer.parseInt(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd")); def headers = ["id","comm_id","city","district","name","avg_price","year_month"] def ret = createNewDatas("福州") @@ -88,9 +89,13 @@ class DistrictPriceExportBatch extends BaseBatch{ return sb.toString() } - def getFzDistricts(def city){ + + def getFzDistricts(def city, def mdate, def endMDate){ def q = new BasicDBObject() q.put("city", city) + if(mdate){ + q.put("m_date", new BasicDBObject('$gte', mdate).append('$lt', endMDate)) + } def rets = [] FZ_DIST_COLL.find(q).each{it-> rets << it @@ -100,7 +105,17 @@ class DistrictPriceExportBatch extends BaseBatch{ def createNewDatas(def city){ - def districts = getFzDistricts(city) + def districts = null + def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + + def day = new Date().getDate() + def startMDate = DateUtils.truncateDay(new Date()-1) + def endMDate = DateUtils.truncateDay(new Date()) + if(day == 15){ + districts = getFzDistricts(city, null, null) + }else{ + districts = getFzDistricts(city, startMDate, endMDate) + } def curPriceMap = findFzDistrictSellStat("福州",curDate) def result = [] for(def rMap : districts){ @@ -126,7 +141,7 @@ class DistrictPriceExportBatch extends BaseBatch{ m << rMap.city m << rMap.region m << rMap.name - if(curPrice){ + if(curPrice && rMap.status==0){ m << curPrice }else{ m << 0 @@ -271,15 +286,20 @@ class DistrictPriceExportBatch extends BaseBatch{ } def saveToDB(rets){ + for(def r : rets){ def q = new BasicDBObject() - q.put("month", curDate.toInteger()) + q.put("month", r[6]) q.put("comm_id", r[1]) def obj = FZ_DISTRICT_STAT_COLL.findOne(q) if(obj){ def udata = new BasicDBObject() udata.put("m_date", new Date()) udata.put("avg_price", r[5]) + + //按comm_id修改,小区名重新赋值,防止区域和小区名修改 + udata.put("region", r[3]) + udata.put("name", r[4]) FZ_DISTRICT_STAT_COLL.update(q, new BasicDBObject('$set', udata)) }else{ def o = new BasicDBObject() @@ -291,6 +311,7 @@ class DistrictPriceExportBatch extends BaseBatch{ o.put("name", r[4]) o.put("avg_price", r[5].toInteger()) o.put("month", r[6].toInteger()) + o.put("c_date", new Date()) FZ_DISTRICT_STAT_COLL.save(o) } } 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 dc389ffe5..24d6b09fe 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 @@ -60,8 +60,9 @@ class DistrictSellStatBatch extends BaseBatch { } def calcMonthlyPrice(){ - def citys = CommonUtils.findAllCity() - def keys = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("estate_type2", 1) + //只有福州使用tob价格 + def citys = CommonUtils.findAllCity() + def keys = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("estate_type2", 1).append("status", 1) def lastMonthWeekend = DateUtils.truncateDay(DateUtils.getLastSundayInWeekOfLastMonth(new Date())) @@ -69,26 +70,43 @@ class DistrictSellStatBatch extends BaseBatch { def monDate = getMomDate(curMonth) def yoyDate = getYoyDate(curMonth) + + def day = new Date().getDate() + def startMDate = DateUtils.truncateDay(new Date()-1) + def endMDate = DateUtils.truncateDay(new Date()) + def index = 0 for(def city : citys){ index++ def districts = [] if(city == "福州"){ - districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList() + if(day == 2){ + districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList() + }else{ + districts = FZ_DIST_COLL.find(new BasicDBObject("city", city).append("m_date", new BasicDBObject('$gte',startMDate).append('$lt', endMDate)), keys).toList() + } }else{ - districts = DbUtils.seaweed.find(new BasicDBObject("city", city).append("cat", "district").append("visible", 0), keys).batchSize(2000) + def q = new BasicDBObject("city", city).append("cat", "district").append("status", 0) + if(day == 2){ + districts = DbUtils.seaweed.find(q, keys).batchSize(2000) + }else{ + q.put("m_date", new BasicDBObject('$gte',startMDate).append('$lt', endMDate)) + districts = DbUtils.seaweed.find(q, keys).batchSize(2000) + } } - print city +" "+districts.size() - def weekendPriceMap = findPriceMap(city, lastMonthWeekend)//上个月小区均价 - def curMonthlyPriceMap = findMonthlyPrice(city, curMonth)//当月小区月均价 - def lastMonthlyPriceMap = findMonthlyPrice(city, monDate)//上个月小区月均价 - def lastYearPriceMap = findMonthlyPrice(city, yoyDate)//去年小区月均价 - if(districts && weekendPriceMap){ - running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap) + println index+" "+city +" "+districts.size()+" "+ (new Date()).toString() + + if(districts.size()>0){ + def weekendPriceMap = findPriceMap(city, lastMonthWeekend)//上个月小区均价 + def curMonthlyPriceMap = findMonthlyPrice(city, curMonth)//当月小区月均价 + def lastMonthlyPriceMap = findMonthlyPrice(city, monDate)//上个月小区月均价 + def lastYearPriceMap = findMonthlyPrice(city, yoyDate)//去年小区月均价 + if(weekendPriceMap){ + running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap) + } } - println index+" "+city +" "+ (new Date()).toString() } } @@ -142,17 +160,15 @@ class DistrictSellStatBatch extends BaseBatch { if(weekendPriceObj.value_type!=1){ if(dist.city == "福州"){ - if(Math.abs(mom)*100>3){ - if(dist.region != "马尾"){ - 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) @@ -170,6 +186,10 @@ class DistrictSellStatBatch extends BaseBatch { if(lastYearPriceObj){ yoy = DataUtil.roundDouble(((curPrice - lastYearPriceObj.avg_price)/(double)lastYearPriceObj.avg_price),4) } + + if(dist.status==1){ + curPrice = 0 + } if(curPriceObj){ if(curPrice!=weekendPriceObj.avg_price){ def data = new BasicDBObject() @@ -207,7 +227,7 @@ class DistrictSellStatBatch extends BaseBatch { // }; // }) } - latch.await() +// latch.await() } @@ -232,6 +252,11 @@ class DistrictSellStatBatch extends BaseBatch { def dbcursor = DISTRICT_STAT.find(q) def priceMap = [:] for(def d : dbcursor){ + if(city == "福州"){ + if(d.avg_price_2b && d.value_type!=1){ + d.avg_price = d.avg_price_2b + } + } priceMap.put(d.region +"##"+d.district_name, d) } return priceMap diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy index 2da506d11..917ddfc5e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/FzDataResultStat.groovy @@ -25,7 +25,7 @@ class FzDataResultStat { static main(args) { def task = new FzDataResultStat() task.priceMarkupRun(); -// task.regionPriceTrendRun() + task.regionPriceTrendRun() //// task.margeExcel() // task.saveCsvData() } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy index 1dd114d8a..76925db82 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy @@ -114,7 +114,10 @@ class HouseExportBatch extends BaseBatch{ // sb.append(s+ "@|@") // } // } - sb.append(StringUtils.join(row.toArray(), "@|@")) + def str = StringUtils.join(row.toArray(), "@|@") + str = str.replace('"','\\"') + sb.append(str) + sb.append(System.getProperty("line.separator")); println index diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy index 9cea6cf74..b0ce64f12 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy @@ -2,6 +2,9 @@ package com.fangjia.script.fuzhou import com.fangjia.core.RegionData import com.fangjia.core.util.GeocodeUtils +import com.fangjia.core.util.JsonUtils +import com.fangjia.core.util.Message +import com.fangjia.core.util.MessageInfo import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.EsUtils import com.fangjia.script.util.DateUtils @@ -9,26 +12,71 @@ import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import net.sf.json.JSONObject import org.apache.commons.io.FileUtils import org.bson.types.ObjectId DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") +import com.fangjia.core.util.HttpRequest -ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\第三方小区区域.xlsx", { d -> - def city = RegionData.formatCity("余姚") - d['D'] = city - if(city){ - d['E'] = RegionData.formatRegion(city, d['C']) - } -// if(!d['D']){ -// def citys = CommonDatautils.getCityByRegion(d['A']) -// if(citys && citys.size()==1){ -// d['F'] = citys.get(0) -// } +//Message message = new Message(); +//message.setMsgtype("text"); +//message.setText(new MessageInfo("测试")); +//URL url = new URL("https://oapi.dingtalk.com/robot/send?access_token=35587c9e7accc54ff7ddf2c6ebdc36a3ba065b4a2bdac78c0e9928596361b430"); +//// 建立http连接 +//HttpURLConnection conn = (HttpURLConnection) url.openConnection(); +//conn.setDoOutput(true); +//conn.setDoInput(true); +//conn.setUseCaches(false); +//conn.setRequestMethod("POST"); +//conn.setRequestProperty("Charset", "UTF-8"); +//conn.setRequestProperty("Content-Type", "application/Json; charset=UTF-8"); +//conn.connect(); +//OutputStream out = conn.getOutputStream(); +//String textMessage = JsonUtils.toJson(message); +//byte[] data = textMessage.getBytes("UTF-8"); +//out.write(data); +//out.flush(); +//out.close(); +//System.out.println(conn.getResponseCode()); +//InputStream ins = conn.getInputStream(); +//byte[] data1 = new byte[ins.available()]; +//ins.read(data1); +//System.out.println(new String(data1)); + +//HttpRequest request = new HttpRequest() +//def params = [:] +//params.put("","") +//request.post("https://oapi.dingtalk.com/robot/send?access_token=35587c9e7accc54ff7ddf2c6ebdc36a3ba065b4a2bdac78c0e9928596361b430","", "utf-8") + + +//sendMarkdownMessage("租金", "测试") +//static void sendMarkdownMessage(String title, String msg){ +// HttpRequest request = new HttpRequest() +// JSONObject requestBody = new JSONObject() +// JSONObject markdown = new JSONObject() +// markdown.put("title", title) +// markdown.put("text", msg) +// requestBody.put("markdown", markdown) +// requestBody.put("msgtype", "markdown") +// request.postWithBody("https://oapi.dingtalk.com/robot/send?access_token=35587c9e7accc54ff7ddf2c6ebdc36a3ba065b4a2bdac78c0e9928596361b430", requestBody, null, "UTF-8") +//} +//ExcelUtils.modify("C:\\Users\\gaojuan\\Downloads\\第三方小区区域.xlsx", { d -> +// def city = RegionData.formatCity("余姚") +// d['D'] = city +// if(city){ +// d['E'] = RegionData.formatRegion(city, d['C']) // } -}) +// +//// if(!d['D']){ +//// def citys = CommonDatautils.getCityByRegion(d['A']) +//// if(citys && citys.size()==1){ +//// d['F'] = citys.get(0) +//// } +//// } +//}) //def datas = ExcelUtils.read("D:\\数据\\福州\\202305月福州统计数据\\福州马尾第三方.xlsx", 0, 1) //def m = [:] @@ -188,6 +236,27 @@ def findThirdPrice(city, region, name, AVERAGE_STATISTICS){ //},0) +def files = CommonDatautils.getAllFiles("D:\\数据\\福州\\原始数据") +if(files){ + for(def filepath : files){ + def filename = filepath.getPath() + def rets = read(filename); + def date = filename.substring(filename.toString().lastIndexOf("_")+1, filename.toString().indexOf(".")) + println date +" "+rets.size() + } +} + + +def read(path){ + File file = new File(path); + def rets = [] + file.eachLine{it-> + rets << it + } + return rets; +} + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy index a3be166aa..2220e87ab 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection //福州第三方均价统计,发送钉钉消息 //def datas = ExcelUtils.read("d:\\数据\\福州\\福州4月2.xlsx",0,1) //def datas = CsvUtils.read("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv"); -def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202304.csv") +def datas = readTxt("d:\\数据\\福州\\FJW_THIRD_PARTY_AVG_PRICE_202306.csv") def count0 = 0 def count1 = 0 def count2 = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy index a57d7551b..34fa4eefe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy @@ -29,10 +29,11 @@ class AddAvgpriceBatch { } def test(){ - def districts = CommonDatautils.findDistrictByCityAndRegions("福州","district", ["马尾"], ["city","region","name", "estate_type2"]) + def districts = CommonDatautils.findAllDistricts("福州","district", ["city","region","name", "estate_type2"]) +// def districts = CommonDatautils.findDistrictByCityAndRegions("福州","district", ["马尾"], ["city","region","name", "estate_type2"]) for(def dist : districts){ //发重算均价命令 - addPrice(dist.city,dist.region,dist.name, dist.estate_type2, DateUtils.parseFromTightByPattern('2023-05-01','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2023-05-30','yyyy-MM-dd')) + addPrice(dist.city,dist.region,dist.name, dist.estate_type2, DateUtils.parseFromTightByPattern('2023-06-30','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2023-07-05','yyyy-MM-dd')) } } def run(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy index df4d9454e..db6f86848 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy @@ -8,6 +8,7 @@ import com.fangjia.script.linxsh.util.AddressUtil import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject +import org.apache.commons.lang.StringUtils import java.util.regex.Matcher import java.util.regex.Pattern @@ -20,8 +21,10 @@ class FiledStrand { def updateIndex = 0; static main(args) { - def task = new FiledStrand(); - task.run(); + + +// def task = new FiledStrand(); +// task.run(); // task.updateOpenDate(); } @@ -265,13 +268,75 @@ class FiledStrand { static def processArea(all_area){ if(all_area){ def v = getValue(all_area) - if(v>=1000 && v<=10000000){ + if(v>=5000 && v<=10000000){ return v.toString().toDouble().toInteger() } } return null } + static def processStandardHeight(height){ + if(height){ + def v = getValue(height) + if(v>=2.4 && v<=10){ + return v.toString() + } + } + return null + } + + static def processElevators(elevators){ + if(elevators){ + def v = getValue(elevators) + if(v>0 && v<=100){ + return v.toString() + } + } + return null + } + + static def processEstateType(estateType){ + if(estateType){ + if(estateType.contains("纯写字楼") || estateType.contains("商务中心")){ + return "标准写字楼" + }else if(estateType.contains("SOHO") || estateType.contains("商住") || estateType.contains("商用") || estateType.contains("LOFT") || estateType.contains("酒店")){ + return "商住两用" + }else if(estateType.contains("园区")){ + return "创意园区" + }else if(estateType.contains("综合体")){ + return "综合体" + }else{ + return "其他" + } + } + return null + } + + static def processStandardArea(area){ + if(area){ + area = area.toString().replace(",",",").replace("㎡", "").replace("m", "").replace("/","") + area = Pattern.compile("[\\u4e00-\\u9fa5]").matcher(area).replaceAll(""); + return area + } + return null + } + + static def processCarSiteRent(rent){ + if(rent){ + def v = getNumberRange(rent) + if(v){ + if(v=="0"){ + return null + }else{ + return v.toString() + } + } + return null + } + return null + } + + static def processName(name){ name = name.replace('·','').replace('.','').replace('●','').replace('@','').replace('%','').replace('?','').replace('Ⅰ期','一期') if (name.contains('(') && name.contains(')')){ @@ -287,25 +352,25 @@ class FiledStrand { if (name.find('【')!=-1 && name.find('】')!=-1){ - def rep_str = name[name.index('【'):name.rfind('】')+1] + def rep_str = name.subsring(name.index('【'),name.rfind('】')+1) name = name.replace(rep_str, '') } if (name.find('【')!=-1 && name.find('】')!=-1){ - def rep_str = name[name.index('【'):name.rfind('】')+1] + def rep_str = name.subsring(name.index('【'),name.rfind('】')+1) name = name.replace(rep_str, '') } if (name.find('(')!=-1 && name.find(')')!=-1){ - def rep_str = name[name.index('('):name.rfind(')')+1] + def rep_str = name.subsring(name.index('('),name.rfind(')')+1) name = name.replace(rep_str, '') } if (name.find('「')!=-1 && name.find('」')!=-1){ - def rep_str = name[name.index('「'):name.rfind('」')+1] + def rep_str = name.subsring(name.index('「'),name.rfind('」')+1) name = name.replace(rep_str, '') } return name @@ -338,7 +403,7 @@ class FiledStrand { if(v){ if([40,50,70].contains(v)){ try { - return v.toString()+"年"; + return v.toString(); }catch(Exception e){ println e.getMessage() } @@ -378,6 +443,16 @@ class FiledStrand { return null } + static def processStandardAddress(def esAddress, def city){ + if(esAddress){ + def formatAddress = AddressUtil.formatAddress(city, esAddress) + if(formatAddress && isStandardRoad(formatAddress)){ + return formatAddress + } + } + return null + } + static def processBlock(city, region, def block){ if(block){ if(block.contains("无") || block.toString().length()>10){ @@ -445,7 +520,7 @@ class FiledStrand { buildStructure = "钢结构"; }else if(val.indexOf("钢、钢筋混凝土")>-1){ buildStructure = "钢、钢筋混凝土结构"; - }else if(val.indexOf("钢筋混凝土")>-1){ + }else if(val.indexOf("钢筋混凝土")>-1 || val.indexOf("钢混")>-1){ buildStructure = "钢筋混凝土结构"; }else if(val.indexOf("混合")>-1){ buildStructure = "混合结构"; @@ -464,6 +539,14 @@ class FiledStrand { return false } + static def isStandardRoad(def s){ + def pattern = Pattern.compile("[路|街|大道|巷]\\d+(号|弄)"); + def matcher = pattern.matcher(s) + if(matcher.find()){ + return true; + } + return false + } static def addBuildAreaToData(def dist, def updateFile){ @@ -618,7 +701,7 @@ class FiledStrand { }else{ return null; } - }else if(estateType2=="写字楼"){ + }else if(estateType2=="写字楼" || estateType2=="office"){ if(estateCharege>=0.35 && estateCharege<=60){ return estateCharege; }else{ @@ -629,7 +712,7 @@ class FiledStrand { println "estateCharege 转不了 "+estateCharege } } - return estateCharege; + return null; } static def processHouseholdCount(def household_count, def estateType2){ @@ -666,6 +749,34 @@ class FiledStrand { return null } + static def processFloor(floor){ + def v = getValue(floor.toString()); + if(v){ + if(v>=1 && v<=130){ + try { + return v.toString(); + }catch(Exception e){ + println e.getMessage() + } + } + } + return null + } + + static def processRealUsePercent(percent){ + def v = getValue(percent.toString()); + if(v){ + if(v>=20 && v<=80){ + try { + return v.toString(); + }catch(Exception e){ + println e.getMessage() + } + } + } + return null + } + static def processFinishBuildingDate(def finishBuildingDate){ if(finishBuildingDate){ Pattern pat1 = Pattern.compile("\\d{4}[年\\-\\.]\\d{2}[月\\-\\.]\\d{2}"); @@ -677,24 +788,37 @@ class FiledStrand { Pattern pat3 = Pattern.compile("\\d{4}"); def matcher3 = pat3.matcher(finishBuildingDate); + def dateStr = null if (matcher1.find()) { - return matcher1.group().replace("年","-").replace("月","-") + dateStr = matcher1.group().replace("年","-").replace("月","-").replace(".","") }else if(matcher2.find()){ - return matcher2.group().replace("年","-") + dateStr = matcher2.group().replace("年","-").replace(".","-") }else if(matcher3.find()){ - return matcher3.group() + dateStr = matcher3.group().replace(".","-") } + if(dateStr){ + dateStr = dateStr.substring(0, 4) + } + return dateStr } return null; } + + static def processCompany(val){ if(val){ if(val.length()>20){ return null }else{ - if(val.contains("无")){ + if(val.contains("暂无")){ + return null + } + if(val == "无"){ + return null + } + if(val.isNumber()){ return null } def fiterChars = [",",".","?","/","数据",'-','?',' ',' '] @@ -771,4 +895,31 @@ class FiledStrand { } return null; } + + static def patternParse(String keyword, String patternStr) { + Pattern pattern = Pattern.compile(patternStr); + Matcher matcher = pattern.matcher(keyword); + String num = ""; + if (matcher.find()) { + if (StringUtils.isNotBlank(matcher.group(0))) { + num = matcher.group(1).trim(); + } + } + return num; + } + + + + static def getNumberRange(def input) { + Pattern pattern = Pattern.compile("\\d+(-\\d+)?"); + Matcher matcher = pattern.matcher(input); + List list = new ArrayList(); + while (matcher.find()) { + list.add(matcher.group()); + } + if(list.size()>0){ + return list.get(0); + } + return null; + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test.groovy index c5ee6bb09..4d5119c0e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/Test.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.gj +import com.fangjia.core.RegionData import com.fangjia.core.util.DateUtil import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.DateUtils @@ -69,29 +70,43 @@ import com.mongodb.DBObject // // //}) -println "开始统计" -def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\成交\\202202.xlsx",0,1) -def map = [:] -for(def d : datas){ - def prices = map.get(d['B']) - if(!prices){ - prices = [] - map.put(d['B'], prices) - } - prices << d['G'] -} - -def regions = ["闵行","浦东","嘉定","普陀","青浦","静安","金山","松江","虹口","杨浦","奉贤","长宁","宝山","徐汇","崇明","黄浦"] -def rows = [] -rows << ["区域","数量", "均价"] - -regions.each{e-> - def prices = map.get(e) - def price = (prices.sum()/prices.size()).toInteger() - rows << [e, prices.size(), price] -} -//map.each{region,prices-> -// def price = (prices.sum()/prices.size()).toInteger() -// rows << [region, prices.size(), price] +//println "开始统计" +//def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\成交\\202202.xlsx",0,1) +//def map = [:] +//for(def d : datas){ +// def prices = map.get(d['B']) +// if(!prices){ +// prices = [] +// map.put(d['B'], prices) +// } +// prices << d['G'] //} -ExcelUtils.write("C:\\Users\\gaojuan\\Desktop\\成交\\trend-2202.xlsx", rows, "结果") \ No newline at end of file +// +//def regions = ["闵行","浦东","嘉定","普陀","青浦","静安","金山","松江","虹口","杨浦","奉贤","长宁","宝山","徐汇","崇明","黄浦"] +//def rows = [] +//rows << ["区域","数量", "均价"] +// +//regions.each{e-> +// def prices = map.get(e) +// def price = (prices.sum()/prices.size()).toInteger() +// rows << [e, prices.size(), price] +//} +////map.each{region,prices-> +//// def price = (prices.sum()/prices.size()).toInteger() +//// rows << [region, prices.size(), price] +////} +//ExcelUtils.write("C:\\Users\\gaojuan\\Desktop\\成交\\trend-2202.xlsx", rows, "结果") + +//ExcelUtils.multiThreadingModify("D:\\数据\\其它\\城市等级.xlsx",{d-> +// d['C'] = RegionData.formatCity(d['A']) +//}) + +DBCollection SERVER_AREA_CONN = MongoUtils.getCollectionByName("fangjia", "server_area", MongoUtils.MongoDB_Domain_mongo); +ExcelUtils.modify("D:\\数据\\其它\\城市等级.xlsx",{d-> + def q = new BasicDBObject() + q.put("display", d['C']) + + def udata = new BasicDBObject() + udata.put("new_city_grade",d['E'].toString().toDouble().toInteger()) + SERVER_AREA_CONN.update(q, new BasicDBObject('$set', udata)) +}) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index 16cae9383..ac0ef538c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -48,11 +48,11 @@ class YouDaDataParser { def final AtomicInteger count_ = new AtomicInteger(0) - static def statDate = "2023-04-01" + static def statDate = "2023-06-01" static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//友达一手房存入mongo -// task.esfParser("D:\\数据\\友达\\2023年5月\\查询1.DBF");//友达二手房存入mongo +// task.esfParser("D:\\数据\\友达\\2023年7月\\查询1.DBF");//友达二手房存入mongo // task.newhouseToSaveEs();//新房保存到es task.esfhouseToSaveEs();//二手房保存到es // task.updateFinishDateByEsfTrade();//根据二手成交的竣工时间修改seaweed库中的竣工时间 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy index 55ce0ed8f..d7fd9e44a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy @@ -435,7 +435,7 @@ class OfficeProcess { pstmt.setString(5, d.source) println count+" "+d.city+" "+d.name pstmt.addBatch() - if(count % 1 ==0) { + if(count % 100 ==0) { try { pstmt.executeBatch() } catch (Exception e) { @@ -480,7 +480,7 @@ class OfficeProcess { } def checkRegion(){ - def citys = ["杭州","苏州"]//"上海","深圳","北京","广州","重庆","成都", + def citys = ["上海"]//"上海","深圳","北京","广州","重庆","成都", for(def city : citys){ def regionPointsMap = findRegionRange(city) def addDatas = findAddDatasByClickhouse(city) @@ -492,7 +492,7 @@ class OfficeProcess { if(data.lng){ def flag = isInArea(data.lng.toString().toDouble(), data.lat.toString().toDouble(), regionPointsMap.get(data.region)) def mark = flag?'T':'F' -// rets << ["city":data.city, "region":data.region, "name":data.name, "source":data.source, "flag":mark] + rets << ["city":data.city, "region":data.region, "name":data.name, "source":data.source, "flag":mark] updateOption(data.city, data.region, data.name, data.source, mark) println index+" "+data.region + " "+data.name+" "+ flag } @@ -502,7 +502,7 @@ class OfficeProcess { } def findAddDatasByClickhouse(city){ - def sql = "select city,region, name,option,lng,lat,source from office where city='${city}' and option like '%添加%'" + def sql = "select city,region, name,option,lng,lat,source from office where city='${city}' and region_fence is null" def datas = [] sqlInstance.eachRow(sql, {r-> datas << ["city":r.city,"region":r.region,"name":r.name, "lat":r.lat, "lng":r.lng, "option":r.option,"source":r.source] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddDistrictElevatorBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddDistrictElevatorBatch.groovy new file mode 100644 index 000000000..cc9c87682 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/AddDistrictElevatorBatch.groovy @@ -0,0 +1,117 @@ +package com.fangjia.script.gj.district + +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.CcbCodeUtils +import com.fangjia.script.util.DbUtils +import com.mongodb.BasicDBObject + +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + +/** + * 通过房源更改电梯 + */ + +@BatchOwner(Watcher.GaoJuan) +class AddDistrictElevatorBatch extends BaseBatch{ + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(60) + + + static main(args) { + runBatch(new AddDistrictElevatorBatch(), args) + } + + + @Override + void process(Object args) { + run() + } + + def run(){ + def citys = CommonDatautils.findAllCity() + for(def c : citys){ + def dists = CommonDatautils.findAllDistricts(c, "district", ["city","region","name","alias", "build_type", "estate_type2", "is_elevator"]) + addEvevatorProcess(c, dists) + } + } + + def addEvevatorProcess(c, dists){ + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(dists.size()) + println "小区量:"+dists.size() + + def rets = new CopyOnWriteArrayList() + for(def i=0;i=3 && newHouses.size()>=haveHouses.size()*0.6){ + println totalCount.get()+" [${dist.estate_type2}] "+dist.name +" 原:"+houses.size()+" 有值:"+haveHouses.size()+" 筛选样本量:"+newHouses.size() + BasicDBObject udata = new BasicDBObject() + if(dist.estate_type2 == "别墅"){ + udata.put("is_elevator", false) + }else{ + udata.put("is_elevator", true) + } + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id', dist._id),new BasicDBObject('$set',udata)) + rets << dist + }else{ + if(dist.build_type && dist.build_type.contains("高层")){ + BasicDBObject udata = new BasicDBObject('is_elevator',true) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id', dist._id),new BasicDBObject('$set',udata)) + rets << dist + } + } + } + } catch (Exception e) { + e.printStackTrace() + } finally { + latch.countDown() + } + }; + }) + } + latch.await() + println c +" "+ rets.size() +// return retMap + } + + def analyElevator(houses, estateType){ + def heights = [] + for(def h : houses){ + if(estateType=="别墅"){ + if(h.height && h.height<=4) { + heights << h.height + } + }else{ + if(h.height && h.height>=10){ + heights << h.height + } + } + } + return heights + } + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFieldAddBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFieldAddBatch.groovy index 9ef0881e4..6aac3ebde 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFieldAddBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFieldAddBatch.groovy @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicLong import java.util.regex.Pattern /** - * 小区字段入库(自动入库) + * 小区字段填充入库(自动入库) */ @BatchOwner(Watcher.GaoJuan) class DistrictFieldAddBatch extends BaseBatch{ @@ -49,7 +49,7 @@ class DistrictFieldAddBatch extends BaseBatch{ "virescence_percent":"greening_rate","cubage_percent":"plot_ratio","build_area":"build_area","all_area":"land_area","household_count":"households", "car_site_count":"parking_cnt","car_site":"parking_cnt","property_life":"land_usage_period","address":"address","build_structure":"building_structure", "build_type":"build_type", "land_property":"ownership_type","live_date":"live_date", - "loop_line_info":"loop_line"]//key:seaweed表字段 value:es表字段 + "loop_line_info":"loop_line","loudong_count":"loudong_cnt"]//key:seaweed表字段 value:es表字段 def fieldsNameMap = ["estate_charge":"物业费","block":"板块","build_date":"建筑年代","estate_company":"物业公司","developer":"开发商", "virescence_percent":"绿化率","cubage_percent":"容积率","build_area":"建筑面积","all_area":"占地面积","household_count":"户型", diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index db058c5a7..a3236b53a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -1,9 +1,14 @@ package com.fangjia.script.gj.district import com.fangjia.core.util.HttpRequest +import com.fangjia.script.statistics.poi.AmapPoi +import com.fangjia.script.temp.shenjian.util.GaoDeUtils import com.fangjia.script.temp.shenjian.util.HttpUtils +import com.fangjia.script.util.HttpRequestUtil +import com.mongodb.DBObject import net.sf.json.JSONArray import net.sf.json.JSONObject +import org.apache.commons.collections.CollectionUtils import org.apache.commons.lang.StringUtils class FangjiaClientUtils { @@ -153,4 +158,18 @@ class FangjiaClientUtils { return columnValMap; } + + public static def saveOrUpdateDistrict(data) { + String jsonStr = com.alibaba.fastjson.JSONObject.toJSONString(data) +// def json = HttpUtils.postForJson("http://192.168.0.100:38080/FangJiaDataService/saveData", jsonStr) +// def json = HttpUtils.postForJson("http://localhost:8080/FangJiaDataService/saveData", jsonStr) + + com.alibaba.fastjson.JSONObject json = HttpUtils.doPost2("http://192.168.0.100:38080/FangJiaDataService/saveData", jsonStr) + if (json.status == 0) { + return "成功" + }else if(json.status == 1){ + return json.msg + } + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldCleanBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldCleanBatch.groovy index 9ec05ed28..0af10b4fa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldCleanBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/OfficeFieldCleanBatch.groovy @@ -4,14 +4,25 @@ import com.fangjia.script.BaseBatch import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.FiledStrand +import com.fangjia.script.linxsh.util.AddressUtil +import com.fangjia.script.looplineinfo.InsidePolygon +import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils +import com.fangjia.script.util.OpenApiClient import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import org.bson.types.ObjectId +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong +import java.util.regex.Pattern /** * 写字楼字段清洗入库(自动入库) @@ -19,6 +30,28 @@ import java.util.concurrent.Executors @BatchOwner(Watcher.GaoJuan) class OfficeFieldCleanBatch extends BaseBatch{ + //"build_date":"build_year", "car_site_count":"parking_cnt","car_site":"parking_cnt","property_life":"land_usage_period","address":"address", + // "live_date":"live_date", "loop_line_info":"loop_line" + def fieldsMap = ["estate_charge":"property_fee","block":"block","estate_company":"property_company","developer":"developer", + "virescence_percent":"greening_rate","cubage_percent":"plot_ratio","build_area":"build_area","all_area":"land_area" + ,"finish_building_date":"finish_building_date","property_life":"property_life","standard_area":"standard_area","total_floor":"total_floor", + "standard_height":"floor_height", "real_use_percent":"room_rate", "loop_line_info":"ring_location","car_site_count":"parking", + "parking_fee":"car_fee","elevators_count":"elevator_num","bay_area":"open_area","estate_type2":"property_type"]//key:seaweed表字段 value:es表字段 + + // + def sourceMap = ["安居客":"安居客app","房天下":"房天下","楼盘网":"楼盘网","办办网":"办办网","点点租":"点点租"] + + def fieldMap = ["编号":"_id","城市":"city","区域":"region","名称":"name","别名":"alias","租金":"rent_price","板块":"block","物业公司":"estate_company","物业费":"estate_charge", + "地址":"address","地址别名":"addr_alias","经度":"lng","纬度":"lat","类型":"estate_type2","建筑面积":"build_area","等级":"bed_kind", + "开发商":"developer","占地面积":"all_area","标准层面积":"standard_area","产权年限":"property_life","总层数":"total_floor","是否涉外":"is_foreign", + "容积率":"cubage_percent","绿化率":"virescence_percent","货梯数":"goods_elevator_count","竣工时间":"finish_building_date","客梯数":"person_elevators_count", + "标准层高":"standard_height","净高":"clear_height","大堂层高":"lobby_height","得房率":"real_use_percent","是否可分割":"divisible","环线位置":"loop_line_info", + "车位描述":"car_site","车位数量":"car_site_count","地上车位":"land_car_site","地下停车位":"underground_car_site","车位租金":"parking_fee","电梯数量":"elevators_count", + "是否注册":"is_register","开间面积":"bay_area","楼层信息":"floor_info"] + + static DBCollection BLOCKPOLYLINECOLL = MongoUtils.getCollectionByName("fangjia_crawl", "price_border2", "mongo.db.fangjia.com") + DBCollection OPERATION_LOG_COLL = MongoUtils.getCollectionByName("fangjia", "operation_log", "mongo.db.fangjia.com") + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) static main(args) { @@ -27,12 +60,182 @@ class OfficeFieldCleanBatch extends BaseBatch{ @Override void process(Object args) { - def citys = CommonDatautils.findAllCity().reverse() - for(def c : citys){ - def offices = findAllOffice(c) - strandField(offices) +// def str = "1200平方/层,1067㎡,1650-1900平米" + + +// def citys = CommonDatautils.findAllCity().reverse() +// for(def c : citys){ +// def offices = findAllOffice(c) +// strandField(offices) +// } + +// addBlock() + +// addFieldValue() + +// updateErrorField() + export() + test() +// addOffice() + } + + def export(){ + def offices = CommonDatautils.findAllFiledDistrict("office", "上海") + def fields = fieldMap.keySet().asList() + def rets = [] + rets << fields + for(def i=0;i + def val = data.get(v) + if(k == "编号"){ + row << val.toString() + }else if(v=="lat" || v=="lng"){ + row << val.toString().toDouble()/10000000000.0 + }else if(v == "divisible"){ + + if(val==1){ + row << "是" + }else if(val==0){ + row << "否" + }else{ + row << '' + } + }else if(v.contains("alias")){ + if(val){ + row << val.join(" ") + }else{ + row << '' + } + }else{ + row << val + } + } + rets << row + } + } + ExcelUtils.write("D:\\数据\\写字楼\\中远.xlsx",rets, "数据") + } + + def test(){ + def datas = ExcelUtils.read("D:\\数据\\写字楼\\写字楼价格(1).xlsx",0 , 1) + def map = [:] + for(def d : datas){ + map.put(d['A']+"#"+d['B']+'#'+d['C'], d) + } + ExcelUtils.multiThreadingModify("D:\\数据\\写字楼\\中远.xlsx",{d-> + def row = map.get(d['B']+"#"+d['C']+'#'+d['D']) + d['F'] = row['F'] + }) + } + + def updateErrorField(){ +// def offices = CommonDatautils.findAllDistrict("office", ["city","estate_charge","addr_alias","property_life", "total_floor","finish_building_date","real_use_percent", "land_car_site", "underground_car_site","parking_fee"]) + def offices = CommonDatautils.findAllDistricts("上海","office", ["city","estate_charge","addr_alias","property_life", "total_floor","finish_building_date","real_use_percent", "land_car_site", "underground_car_site","parking_fee"]) + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(offices.size()) + + for(def i=0;i60 || val < 0.35){ +//// println val +// udata.put("estate_charge", null) +//// } +// } + + if(udata){ + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id',o._id),new BasicDBObject('$set',udata)) + } + } + + + def addFieldValue(){ + def citys = ["上海"] + def analysRets = [] + for(def c : citys){ + def totalCount = CommonDatautils.findAllDistrictCount("office", c) + if(totalCount){ + analysRets = addFieldFromMatch(c, totalCount, analysRets) + } + } } @@ -65,15 +268,445 @@ class OfficeFieldCleanBatch extends BaseBatch{ } - def findAllOffice(city){ - def sql = "select * from office where city='${city}'" - def rets = [] - ElasticUtils.executeSqlQuery(sql, { d-> - rets << d + def findEsDatas(c, esWebSource){ + def list = [] + ElasticUtils.executeSqlQuery("select * from office where city='${c}' and source='${esWebSource}'", {r-> + list << r + }) + return list + } + + + def matchDist(city, region, name){ + def dist = CommonDatautils.findDistrict(city, region, name, "office") + return dist; + } + + def matchApi(esRets){ + def rets = new CopyOnWriteArrayList() + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(esRets.size()) + for(def i=0;i=0.9){ + matchRets1 << r + } + } + return matchRets1 + } + + + def addFieldFromMatch(c, totalCount, analysRets){ + def fields = fieldsMap.keySet() as List + + sourceMap.each { seaweedmapSource, esWebSource -> + def esRets = findEsDatas(c, esWebSource) +// esRets = esRets[0..100] + def matchRets1 = matchApi(esRets) + def matchRets2 = selectRestByCredit(matchRets1) + println esWebSource +" 抓取量:"+esRets.size()+" 匹配量:"+matchRets1.size()+" 0.9分以上量:"+matchRets2.size() + + def updateRets = processFieldsFromMatch(c , matchRets2) + println "【通过匹配填充字段】网站:"+seaweedmapSource +" Es:"+esRets.size()+" 融合小区占比:"+ DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/totalCount)+"%" + def precentMap = fieldUpdate(totalCount, updateRets) + println c +" "+precentMap.toString() + updateDB(c, updateRets) + println "------------------------------------------------------------------------------" + def pre1 = 0 + def pre2 = 0 + if(esRets){ + pre1 = DataHandleUtils.getDoubleRound(2, matchRets1.size()*100/esRets.size()) + pre2 = DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/esRets.size()) + } + def analyRet = [] + analyRet << seaweedmapSource + analyRet << c + fields.each{key-> + analyRet << precentMap.get(key) + } + analyRet << esRets.size() + analyRet << matchRets1.size() + analyRet << matchRets2.size() + analyRet << pre1 + analyRet << pre2 + analysRets << analyRet + } + return analysRets; + } + + def fieldUpdate(total,updateRets){ + + def countMap = [:] + + for(def rm : updateRets){ + def valMap = rm.value + fieldsMap.each{seaweedfield,esField-> + if(valMap.containsKey(seaweedfield)) { + if(countMap.containsKey(seaweedfield)) { + countMap.put(seaweedfield, countMap.get(seaweedfield) + 1) + }else{ + countMap.put(seaweedfield, 1) + } + } + } + } + + println countMap.toString() + def precentMap = [:] + fieldsMap.each() {key,skey-> + if(countMap.containsKey(key)) { + precentMap.put(key, DataHandleUtils.getDoubleRound(2, countMap.get(key)*100/total)) + }else { + precentMap.put(key, 0) + } + } + return precentMap; + } + + + def processFieldsFromMatch(c,matchRets){ + def fields = fieldsMap.keySet() as List + fields << "city" + fields << "estate_type2" + def fieldValueMap = [:] + for(def matchDist : matchRets){ + def dist = CommonDatautils.findDistrictFieldById(matchDist.match_id, fields) + if(!dist){ + println c+" "+matchDist.match_id+" 不存在" + continue + } + def newValues = strandField(c, dist, matchDist) + if(newValues){ + println dist._id.toString()+" "+newValues.toString() + fieldValueMap.put(dist._id.toString(), newValues) + } + } + + return fieldValueMap; + } + + def strandField(c,dist, matchDist){ + def newValues = [:] + fieldsMap.each{seaweedfield,esField-> + def val = dist.get(seaweedfield) + if(!val){ + def esVal = matchDist.get(esField) + if(esVal){ + def newVal = null + if(seaweedfield == "estate_charge"){ + if(dist.cat == "office"){ + newVal = FiledStrand.processEstateCharge(c, FiledStrand.getNumber(esVal), "office") + }else{ + newVal = FiledStrand.processEstateCharge(c, FiledStrand.getNumber(esVal), dist.estate_type2) + } + + newVal = newVal.toString() + } + if(seaweedfield == "build_date" || seaweedfield == "live_date"){ + newVal = FiledStrand.processFinishBuildingDate(esVal) + } + if(seaweedfield == "estate_company" || seaweedfield == "developer"){ + newVal = FiledStrand.processCompany(esVal) + } + if(seaweedfield =="virescence_percent"){ + newVal = FiledStrand.processVirescencePercent(esVal) + } + + if(seaweedfield =="cubage_percent"){ + newVal = FiledStrand.processCubagePercent(esVal) + } + + if(seaweedfield =="all_area" || seaweedfield =="build_area"){ + newVal = FiledStrand.processArea(esVal.toString()) + if(newVal){ + newVal = newVal.toString() + } + } + if(seaweedfield =="household_count"){ + newVal = FiledStrand.processHouseholdCount(esVal, dist.estate_type2) + } + + if(seaweedfield =="loudong_count"){ + newVal = FiledStrand.processLoudongCount(esVal) + } + + if(seaweedfield =="car_site_count"){ + newVal = FiledStrand.processCarSite(esVal) + } + if(seaweedfield =="car_site"){ + newVal = FiledStrand.processCarSiteDesc(esVal) + } + + if(seaweedfield =="property_life"){ + newVal = FiledStrand.processPropertyLife(esVal) + } + + if(seaweedfield =="alias"){ + newVal = FiledStrand.processAlias(esVal, dist.name, dist.alias) + } + + if(seaweedfield =="address"){ + newVal = FiledStrand.processAddress(esVal, dist.city) + } + if(seaweedfield =="block"){ + newVal = FiledStrand.processBlock(dist.city, dist.region, esVal) + } + + if(seaweedfield == "build_type"){ + if(dist.cat == "office") { + newVal = FiledStrand.processBuildType(esVal, "office") + }else{ + newVal = FiledStrand.processBuildType(esVal, dist.estate_type2) + } + + } + + if(seaweedfield == "land_property"){ + newVal = FiledStrand.processlandProperty(esVal) + } + + if(seaweedfield == "build_structure"){ + newVal = FiledStrand.processBuildStructure(esVal) + } + + if(seaweedfield == "total_floor"){ + newVal = FiledStrand.processFloor(esVal) + } + + if(seaweedfield == "real_use_percent"){ + newVal = FiledStrand.processRealUsePercent(esVal) + } + if(seaweedfield == "parking_fee"){ + newVal = FiledStrand.processCarSiteRent(esVal) + } + + if(seaweedfield == "elevators_count"){ + newVal = FiledStrand.processElevators(esVal) + } + + if(seaweedfield == "standard_area"){ + newVal = FiledStrand.processStandardArea(esVal) + } + + if(seaweedfield == "standard_height"){ + newVal = FiledStrand.processStandardHeight(esVal) + } + + if(seaweedfield == "bay_area"){ + newVal = esVal + } + + if(seaweedfield == "estate_type2"){ + newVal = FiledStrand.processEstateType(esVal) + } + + if(newVal){ + newValues.put(seaweedfield, newVal) + } + } + } + } + return newValues; + } + + def updateDB(c, updateRets){ + + for(def rm : updateRets) { + def id = rm.key + def valMap = rm.value + + BasicDBObject udata = new BasicDBObject() + valMap.each {k,v-> + udata.put(k,v) + } + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id',new ObjectId(id)),new BasicDBObject('$set',udata)) + } + } + + def addBlock(){ + def rets = findAllBlockRange() + + def offices = CommonDatautils.findAllDistricts("上海", "office", ["city","region","name","block","lat2", "lng2"]) + + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(offices.size()) + + + for(def i=0;i<=offices.size();i++){ + final def office = offices[i] + if(office && !office.block){ + fixedThreadPool.execute(new Runnable() { + void run() { + try { + totalCount.addAndGet(1) + + def lastObj = null + for (def r : rets) { + def flag = InsidePolygon.isInArea(office.lng2 / 10000000000.0, office.lat2 / 10000000000.0, r.points) + if (flag && r.name) { + lastObj = r; + break; + } + } + if (lastObj) { + def udata = [:] + udata.put("block", lastObj.name) + udata.put("status", "0") + udata.put("cat", "office") + udata.put("username", "高娟") + udata.put("id", office._id.toString()) + udata.put("loopLineInfo", lastObj.loop) + def s = FangjiaClientUtils.saveOrUpdateDistrict(udata) + println s + } + } catch (Exception e) { + e.printStackTrace() + } finally { + latch.countDown() + } + } + }); + } + } + + latch.await() + } + + def findAllBlockRange(){ + def rets = [] + def q = new BasicDBObject() + def dbcursor = BLOCKPOLYLINECOLL.find(q) + for(def d : dbcursor) { + def pointList = InsidePolygon.createPoint3(d.border); + d.points = pointList + rets << d + } + return rets; + } + + def saveOptLog(city, region, name, datas){ + def obj = new BasicDBObject(); + obj.put("city",city); + obj.put("region",region); + obj.put("district_name",name); + obj.put("category","office"); + obj.put("c_date", new Date()) + obj.put("m_date", new Date()) + obj.put("type", "update") + obj.put("data", datas) + obj.put("user_name", "高娟") + obj.put("origin", "script") + OPERATION_LOG_COLL.save(obj) + } + + def addOffice(){ + def city = "上海" + ExcelUtils.multiThreadingModify("D:\\数据\\写字楼\\bd_file_insert(待入库).xlsx",{d-> + def udata = [:] + def formatAddress = AddressUtil.formatAddress(city, d['B']) + udata.put("city", city) + udata.put("region", d['A']) + udata.put("name", d['D']) + udata.put("address", formatAddress) + long lng = (d['L'].toString().toDouble()*10000000000).longValue() + long lat = (d['K'].toString().toDouble()*10000000000).longValue() + + udata.put("lat", lat) + udata.put("lng", lng) + udata.put("status", "0") + udata.put("cat", "office") + udata.put("username", "高娟") + def s = FangjiaClientUtils.saveOrUpdateDistrict(udata) + println d['D'] + s }) - return rets } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy index 945227e7a..597926900 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy @@ -4,18 +4,63 @@ import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.looplineinfo.InsidePolygon import com.fangjia.script.looplineinfo.Point +import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +/** + *处理地址在地址别名中有重复 + */ class SameDistName { static DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline") static main(args) { def task = new SameDistName() - task.run() +// task.run() + //地址和地址别名完全一致 + task.addressPocess() + } + + + + def addressPocess(){ + def citys = ["福州"]//CommonDatautils.findAllCity(); + + for(def c : citys){ + def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region", "name", "address","addr_alias"]) + if(dists){ + def index = 0 + for(def dist : dists){ + if(dist.address){ +// if(dist.address.toString().endsWith("弄")){ +// dist.address = dist.address.toString().replace("弄","号") +// } + if(dist.addr_alias && dist.addr_alias.contains(dist.address)){ + def new_address_alias = [] + for(def addr : dist.addr_alias){ + if(!new_address_alias.contains(addr) && addr!=dist.address){ + new_address_alias << addr + } + } + index ++ + + println "[${index}] "+dist.city +" "+dist.name+" 旧:"+dist.addr_alias+" 新:"+ new_address_alias + + def d = new BasicDBObject() + d.put("_id", dist._id) + + def udata = new BasicDBObject() + udata.put("m_date", new Date()) + udata.put("addr_alias", new_address_alias) + DbUtils.seaweed.update(d, new BasicDBObject('$set', udata)) + } + } + } + } + } } def run(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/RemoveHouse.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/RemoveHouse.groovy new file mode 100644 index 000000000..315821223 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/house/RemoveHouse.groovy @@ -0,0 +1,45 @@ +package com.fangjia.script.gj.house + +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.Bytes +import com.mongodb.DBCollection + +@BatchOwner(Watcher.GaoJuan) +class RemoveHouse extends BaseBatch{ + + DBCollection SEABIRD_COLL = MongoUtils.getCollectionByName("fangjia", "seabird", "mongo.db.fangjia.com") + + static main(args) { + runBatch(new RemoveHouse(), args) + } + + @Override + void process(Object args) { + def start = new Date() + def endDate = DateUtils.parseFromTightYYYYMMDD("2023-02-01") + def q = new BasicDBObject() + q.put("c_date", new BasicDBObject('$lte', endDate)) + def dbcursor = SEABIRD_COLL.find(q).batchSize(2000).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + + def rets = [] + for(def d : dbcursor){ + rets << d._id + if(rets.size()==50){ + def delquery = new BasicDBObject() + delquery.put("_id", new BasicDBObject('$in', rets)) + SEABIRD_COLL.remove(delquery) + rets = [] + print "." + } + } + def end = new Date() + + println "开始时间:"+start + println "结束时间:"+end + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationBatch.groovy new file mode 100644 index 000000000..c92e387fe --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/DistrictLocationBatch.groovy @@ -0,0 +1,121 @@ +package com.fangjia.script.gj.location + + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.looplineinfo.InsidePolygon +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.mongodb.DBObject + +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + +/** + * 判断小区是否在城市范围内 + */ +class DistrictLocationBatch { + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + static DBCollection RANGECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "city_polyline") + + static main(args) { + def task = new DistrictLocationBatch() +// task.run() + task.deleteDist() + } + + def deleteDist(){ + ExcelUtils.multiThreadingModify("d:\\数据\\小区\\非本城市小区.xlsx",{d-> + DBObject q = new BasicDBObject() + q.put("city", d['A']) + q.put("region", d['B']) + q.put("name", d['C']) + q.put("cat", 'district') + q.put("status", 0) + + def udata = new BasicDBObject() + udata.put("status", 1) + udata.put("m_date", new Date()) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + }) + } + + def run() { + def citys = CommonDatautils.findAllCity() + def cityMap = findCityRange() + def allrets = [] + for (def city : citys) { + def points = cityMap.get(city) + def pointList = InsidePolygon.createPoint3(points); + def disticts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name","address", "lat", "lng"]) + def rets = findNotInCityDistricts(city, disticts, pointList) + allrets.addAll(rets) + } + ExcelUtils.write("d:\\数据\\小区\\非本城市小区.xlsx", allrets, "经纬度不在此城市中") + } + + def findNotInCityDistricts(city, districts, pointList){ + def rets = Collections.synchronizedList(new ArrayList()); + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(districts.size()) + + for(def i=0;i + if(!citys1.contains(c)){ + c = c.replace("州","") + JSONObject resp = request.getJsonContent("http://restapi.amap.com/v3/config/district?key=4ccfe3c898a9489884bd2bcb1ef6dcde&keywords=${c}&subdistrict=0&extensions=all", null, "UTF-8") + if(resp.containsKey("districts")){ + def datas = resp.get("districts") + for(def d : datas){ + println c +" "+ d.name+" "+d.level + if(["上海市","北京市","天津市","重庆市"].contains(d.name.toString())){ + rows << d + }else{ + if(d.level=="city"){ + rows << d + } + } + } + } + } + } + + + +// citys.each{c-> +// println c +// JSONObject resp = request.getJsonContent("http://restapi.amap.com/v3/config/district?key=4ccfe3c898a9489884bd2bcb1ef6dcde&keywords=${c}&subdistrict=0&extensions=all", null, "UTF-8") +// if(resp.containsKey("districts")){ +// def datas = resp.get("districts") +// for(def d : datas){ +// println c +" "+ d.name+" "+d.level +// if(["上海市","北京市","天津市","重庆市"].contains(d.name.toString())){ +// rows << d +// }else{ +// if(d.level=="city"){ +// rows << d +// } +// } +// } +// } +// } + if(rows){ + rows.each {r-> + def obj = new BasicDBObject() + obj.put("level", r.level) + obj.put("center", r.center) + obj.put("center", r.center) + obj.put("polyline", r.polyline) + obj.put("name", r.name) + obj.put("adcode", r.adcode) + obj.put("citycode", r.citycode) + + def city = RegionData.formatCity(r.name) + obj.put("fjw_city", city) + POLYLINECOLL.save(obj) + } + } + + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy similarity index 80% rename from projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy rename to projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy index 3c2061a52..994019514 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/LocationTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/RegionLocationUpdateBatch.groovy @@ -3,6 +3,9 @@ package com.fangjia.script.gj.location import com.fangjia.core.RegionData import com.fangjia.core.util.BaiDuApiUtils import com.fangjia.core.util.GeocodeUtils +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.district.FangjiaClientUtils @@ -25,28 +28,122 @@ import java.util.concurrent.atomic.AtomicLong import java.util.regex.Matcher import java.util.regex.Pattern; - -class LocationTest { +/** + * 根据区域围栏修正区域 + */ +@BatchOwner(Watcher.GaoJuan) +class RegionLocationUpdateBatch extends BaseBatch{ static DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline") public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + DBCollection OPERATION_LOG_COLL = MongoUtils.getCollectionByName("fangjia", "operation_log", "mongo.db.fangjia.com") + - def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl", - "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") static main(args) { -// Date date=new Date(1622802609); -// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// String str = format.format(date); -// System.out.println(str); + runBatch(new RegionLocationUpdateBatch(), args); + } - def task = new LocationTest() - task.run() + @Override + public void process(Object args) { + regionUpdate() +// task.run() // task.run2() // task.run3() // task.run4() // task.run5() } + def regionUpdate(){ + def citys = CommonDatautils.findAllCity() + def rets = [] + def index = 0 + for(def city : citys){ + index ++ + def regionPointsMap = findRegionRange(city) + def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "address", "lat", "lng"]); + def datas = findInRegionDistricts(city, districts, regionPointsMap) + println "【${index}】"+city +" 经纬度处理完成" + rets.addAll(datas) + } + ExcelUtils.write("D:\\数据\\小区\\区域纠正.xlsx", rets, "数据") + } + + + def findInRegionDistricts(city, districts, regionPointsMap){ + def index = 0 + def rets = Collections.synchronizedList(new ArrayList()); + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(districts.size()) + def regionMap = [:] + regionPointsMap.each{k,v-> + def pointList = InsidePolygon.createPoint3(v); + regionMap.put(k, pointList) + } + def keys = regionPointsMap.keySet() + for(def i=0;i0){ def standardCity = RegionData.formatCity(cityMap.name) if(standardCity){ - saveData(standardCity, m.name, m.ad_code , ret); + def newRegion = RegionData.formatRegion(standardCity, m.name) + saveData(pro, standardCity, m.name, m.ad_code , ret, newRegion); }else{ println cityMap.name +" 没有标准化" } @@ -102,7 +103,7 @@ class RegionPointCrawl { def findCityCode(city){ Pattern pattern = Pattern.compile(city, Pattern.CASE_INSENSITIVE); def q = null; - if(city.contains("省") || city.endsWith("自治区")){ + if(city.contains("省") || city.endsWith("自治区") || ["上海市","天津市","北京市","重庆市"].contains(city)){ q = new BasicDBObject("province", pattern); }else{ q = new BasicDBObject("name", pattern); @@ -156,18 +157,22 @@ class RegionPointCrawl { } } - def saveData(city, region, code, ret){ + def saveData(pro, city, region, code, ret, formatRegion){ def q = new BasicDBObject() q.put("code", code) def dbo = POLYLINECOLL.findOne(q) if(!dbo){ def o = new BasicDBObject() + o.put("province", pro) o.put("city", city) o.put("region", region) o.put("code", code) o.put("center", ret.center.get(0)) o.put("level", ret.level.get(0)) o.put("polyline", ret.polyline.get(0)); + if(formatRegion){ + o.put("fjw_region", formatRegion) + } POLYLINECOLL.save(o); } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy index 1068d1f84..88b01f6c1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy @@ -204,9 +204,13 @@ public class BeiKeCrawlByChrome { if(dealDate && dealDate.getTime()>=endDate.getTime()){ detailUrls << durl def dbo = findTrade(durl , "贝壳找房") + if (!dbo) { - parse(city, e, region, driver) + parse(city, e, region, driver, null) } +// else if(dbo && !dbo.lift){ +// parse(city, e, region, driver, dbo._id) +// } }else{ stop = true; break; @@ -224,7 +228,7 @@ public class BeiKeCrawlByChrome { return detailUrls } - def parse(city,e, region, driver){ + def parse(city,e, region, driver, id){ try { def detailUrl = e.select(".title a").attr("href") @@ -289,20 +293,29 @@ public class BeiKeCrawlByChrome { } detail.source = "贝壳找房" - def liftStr = JQueryUtils.selectText("li:contains(梯户比例)",detailDoc).replace("梯户比例","") + def detailDiv1 = JQueryUtils.select(".introContent .base", detailDoc) + def detailDiv2 = JQueryUtils.select(".introContent .transaction", detailDoc) + + def liftStr = null; + if(detailDiv1){ + liftStr = detailDiv1.select("li:contains(梯户比例)").text().replace("梯户比例","") + } if(liftStr){ detail.lift = DataFormatUtils.parseLift(liftStr) detail.lift_household = DataFormatUtils.parseHousehold(liftStr) } - detail.trade_property = JQueryUtils.selectText("li:contains(交易权属)", detailDoc).replace("交易权属","") - detail.room_structure = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(户型结构)", detailDoc).replace("户型结构","")) - detail.property_ownership = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(房权所属)", detailDoc).replace("房权所属","")) - detail.housing_age = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(房屋年限)", detailDoc).replace("房屋年限","")) - detail.elevator = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(配备电梯)", detailDoc).replace("配备电梯","")) - detail.build_structure = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(建筑结构)", detailDoc).replace("建筑结构","")) - detail.build_year = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(建成年代)", detailDoc).replace("建成年代","")) - detail.build_type = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(建筑类型)", detailDoc).replace("建筑类型","")) - def floorStr = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(所在楼层)", detailDoc).replace("㎡","")) + detail.room_structure = DataFormatUtils.getValue(detailDiv1.select("li:contains(户型结构)").text().replace("户型结构","")) + detail.elevator = DataFormatUtils.getValue(detailDiv1.select("li:contains(配备电梯)").text().replace("配备电梯","")) + detail.build_structure = DataFormatUtils.getValue(detailDiv1.select("li:contains(建筑结构)").text().replace("建筑结构","")) + detail.build_year = DataFormatUtils.getValue(detailDiv1.select("li:contains(建成年代)").text().replace("建成年代","")) + detail.build_type = DataFormatUtils.getValue(detailDiv1.select("li:contains(建筑类型)").text().replace("建筑类型","")) + def floorStr = DataFormatUtils.getValue(detailDiv1.select("li:contains(所在楼层)").text().replace("㎡","")) + + detail.trade_property = detailDiv2.select("li:contains(交易权属)").text().replace("交易权属","") + detail.property_ownership = DataFormatUtils.getValue(detailDiv2.select("li:contains(房权所属)").text().replace("房权所属","")) + detail.house_use = DataFormatUtils.getValue(detailDiv2.select("li:contains(房屋用途)").text().replace("房屋用途","")) + detail.house_use = DataFormatUtils.getValue(detailDiv2.select("li:contains(房屋用途)").text().replace("房屋用途","")) + detail.housing_age = DataFormatUtils.getValue(detailDiv2.select("li:contains(房屋年限)").text().replace("房屋年限","")) if(detail.total_price && detail.avg_price){ detail.url = detailUrl @@ -323,8 +336,11 @@ public class BeiKeCrawlByChrome { detail.create_date = new Date() detail.m_date = new Date() println detail - DEAL_PRICE_COLL.save(detail) - + if(id){ + DEAL_PRICE_COLL.update(new BasicDBObject("_id",id),new BasicDBObject('$set',detail)) + }else{ + DEAL_PRICE_COLL.save(detail) + } } } }catch(Exception ex){ @@ -478,12 +494,14 @@ public class BeiKeCrawlByChrome { WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //获取点击登陆按钮。 - elemUsername.sendKeys("15021384995"); +// elemUsername.sendKeys("15021384995"); +// elemPassword.sendKeys("12qwaszx"); - elemPassword.sendKeys("12qwaszx"); + elemUsername.sendKeys("16283166371"); + elemPassword.sendKeys("Goojia123456"); btn.submit(); // 点击行为; - Thread.sleep(20000) + Thread.sleep(10000) }catch(Exception e){ Thread.sleep(15000) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy index 0c82ca47e..52e1665f4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy @@ -1,6 +1,7 @@ package com.fangjia.script.gj.paimai import com.fangjia.core.RegionData +import com.fangjia.core.util.GeocodeUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.crawl.JQueryUtils import com.fangjia.script.gj.ccb.FileUtils @@ -297,16 +298,24 @@ public class LianjiaCrawlByChrome { def dealDate = e.select(".dealDate").text() dealDate = DateUtils.parseFromTightByPattern(dealDate, "yyyy.MM.dd") def endDate = DateUtils.parseFromTightByPattern(startMonth + "-01", "yyyy-MM-dd") - if(dealDate.getTime()>=endDate.getTime()){ - detailUrls << durl - def dbo = findTrade(durl , "链家在线") - if (!dbo) { - parse(city, e, regionText, driver) + if(dealDate){ + if(dealDate.getTime()>=endDate.getTime()){ + detailUrls << durl + def dbo = findTrade(durl , "链家在线") + if (!dbo) { + parse(city, e, regionText, driver, null) + } +// else if(dbo && !dbo.lift){ +// parse(city, e, regionText, driver, dbo._id) +// } + }else{ + stop = true; + break; } }else{ - stop = true; - break; + println url +" 成交时间有误!" } + } if(page>=100){ stop = true; @@ -320,14 +329,13 @@ public class LianjiaCrawlByChrome { return detailUrls } - def parse(city,e, regionText, driver){ + def parse(city,e, regionText, driver, id){ try { def price = e.select(".totalPrice .number").text() if(price){ def detailUrl = e.select(".title a").attr("href") driver.get(detailUrl) def detailDoc = checkDocument(driver, detailUrl); - def title = e.select(".title a").text() if (title) { def detail = new BasicDBObject() @@ -345,6 +353,15 @@ public class LianjiaCrawlByChrome { if(detail.region){ detail.region = RegionData.formatRegion(city, detail.region) } + if(!detail.region){ + def str = detailDoc.toString().substring(detailDoc.toString().indexOf("resblockPosition")+18, detailDoc.toString().size()-1) + str = str.substring(0, str.indexOf("',")) + def locArrs = str.split(",") + def gmap = GeocodeUtils.geoconvBaiduToGoogle(locArrs[0].toString().toDouble(), locArrs[1].toString().toDouble()) + if(gmap){ + detail.region = CommonDatautils.getRegionByLocation(city, gmap.lng+","+gmap.lat) + } + } def roomStr = arrs[1] if (roomStr) { @@ -386,20 +403,22 @@ public class LianjiaCrawlByChrome { detail.source = "链家在线" detail.url = detailUrl - def liftStr = JQueryUtils.selectText("li:contains(梯户比例)",detailDoc).replace("梯户比例","") + def detailDiv = JQueryUtils.select(".introContent", detailDoc) + + def liftStr = detailDiv.select("li:contains(梯户比例)").text().replace("梯户比例","") if(liftStr){ detail.lift = DataFormatUtils.parseLift(liftStr) detail.lift_household = DataFormatUtils.parseHousehold(liftStr) } - detail.trade_property = JQueryUtils.selectText("li:contains(交易权属)", detailDoc).replace("交易权属","") - detail.room_structure = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(户型结构)", detailDoc).replace("户型结构","")) - detail.property_ownership = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(房权所属)", detailDoc).replace("房权所属","")) - detail.housing_age = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(房屋年限)", detailDoc).replace("房屋年限","")) - detail.elevator = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(配备电梯)", detailDoc).replace("配备电梯","")) - detail.build_structure = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(建筑结构)", detailDoc).replace("建筑结构","")) - detail.build_year = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(建成年代)", detailDoc).replace("建成年代","")) - detail.build_type = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(建筑类型)", detailDoc).replace("建筑类型","")) - def floorStr = DataFormatUtils.getValue(JQueryUtils.selectText("li:contains(所在楼层)", detailDoc).replace("所在楼层","")) + detail.trade_property = detailDiv.select("li:contains(交易权属)").text().replace("交易权属","") + detail.room_structure = DataFormatUtils.getValue( detailDiv.select("li:contains(户型结构)").text().replace("户型结构","")) + detail.property_ownership = DataFormatUtils.getValue( detailDiv.select("li:contains(房权所属)").text().replace("房权所属","")) + detail.housing_age = DataFormatUtils.getValue( detailDiv.select("li:contains(房屋年限)").text().replace("房屋年限","")) + detail.elevator = DataFormatUtils.getValue( detailDiv.select("li:contains(配备电梯)").text().replace("配备电梯","")) + detail.build_structure = DataFormatUtils.getValue( detailDiv.select("li:contains(建筑结构)").text().replace("建筑结构","")) + detail.build_year = DataFormatUtils.getValue( detailDiv.select("li:contains(建成年代)").text().replace("建成年代","")) + detail.build_type = DataFormatUtils.getValue( detailDiv.select("li:contains(建筑类型)").text().replace("建筑类型","")) + def floorStr = DataFormatUtils.getValue( detailDiv.select("li:contains(所在楼层)").text().replace("所在楼层","")) if(detail.total_price && detail.avg_price){ def houseInfo = e.select(".houseInfo").text() @@ -417,7 +436,12 @@ public class LianjiaCrawlByChrome { detail.create_date = new Date() detail.m_date = new Date() println detail - DEAL_PRICE_COLL.save(detail) + if(id){ + DEAL_PRICE_COLL.update(new BasicDBObject("_id",id),new BasicDBObject('$set',detail)) + }else{ + DEAL_PRICE_COLL.save(detail) + } + } } } @@ -547,9 +571,9 @@ public class LianjiaCrawlByChrome { if(cityEles){ for(def e : cityEles) { def href = e.attr("href") -// if (!href.contains("fang.lianjia") && citys.contains(e.text())){ + if (!href.contains("fang.lianjia")){ cityList << [e.text(), href] -// } + } } } return cityList @@ -569,9 +593,11 @@ public class LianjiaCrawlByChrome { WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //获取点击登陆按钮。 - elemUsername.sendKeys("15021384995"); +// elemUsername.sendKeys("15021384995"); +// elemPassword.sendKeys("12qwaszx"); - elemPassword.sendKeys("12qwaszx"); + elemUsername.sendKeys("16283166371"); + elemPassword.sendKeys("Goojia123456"); btn.submit(); // 点击行为; Thread.sleep(15000) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy index f419acf6d..43fb6f3b3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy @@ -2,6 +2,7 @@ package com.fangjia.script.gj.poc import com.fangjia.script.ccbevaluation.CcbCommonUtils import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject @@ -21,10 +22,11 @@ class AddPriceTest { task.run(); } def run(){ - def filePath = "C:\\Users\\gaojuan\\Desktop\\深圳政府指导价.xlsx" - addGXDPrice(filePath) + def filePath = "C:\\Users\\gaojuan\\Desktop\\7月成交案例badcase.xlsx" +// addGXDPrice(filePath) // addCcbPrice(filePath) // addThirdPrice(filePath) + addFjwPrice(filePath) } @@ -105,12 +107,12 @@ class AddPriceTest { def addGXDPrice(filepath){ ExcelUtils.multiThreadingModify(filepath, { d -> if (d['B']) { -// def dist = CommonDatautils.findDistrictById(d['B']) -// if(dist){ -// def gxdPrice = findGXDPrice(dist.city, dist.region, dist.name) - def gxdPrice = findGXDPrice(d['D'], d['E'], d['C']) - d['G'] = gxdPrice -// } + def dist = CommonDatautils.findDistrictById(d['E']) + if(dist){ + def gxdPrice = findGXDPrice(dist.city, dist.region, dist.name) +// def gxdPrice = findGXDPrice(d['D'], d['E'], d['C']) + d['L'] = gxdPrice + } } }) } @@ -129,4 +131,22 @@ class AddPriceTest { } return price } + + + def addFjwPrice(path){ + ExcelUtils.multiThreadingModify(path,{d-> + if(!d['K']){ + def dist = CommonDatautils.findDistrictById(d['E']) + if(dist){ +// d['N'] = dist.region + def dbo = CommonDatautils.queryDistrictPrice(dist.city, dist.region, dist.name, DateUtils.parseFromTightByPattern("2023-07-16","yyyy-MM-dd")) + if(dbo){ +// d['K'] = dbo.avg_price + d['K'] = dbo.avg_price_2b + } + } + } + }) + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy index bb19fe69d..72df7724e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy @@ -28,9 +28,18 @@ class DayUpdateDistRefreshBatch extends BaseBatch{ if(dists){ for(def d : dists){ - def distObj = CommonDatautils.findDistrictByParams(d.city, d.region, d.name, "district", fields) + def distObj = null + if(d.comm_id){ + distObj = CommonDatautils.findDistrictById(d.comm_id) + }else{ + distObj = CommonDatautils.findDistrictByParams(d.city, d.region, d.name, "district", fields) + } if(distObj && distObj._id){ - FzDataUtils.converDistrict(distObj, null, null); + if(d.type && d.type==1){ + FzDataUtils.removeById(d.comm_id) + }else{ + FzDataUtils.converDistrict(distObj, null, null); + } println new Date().toString()+" 【处理完成】 "+d.city +" "+d.region+" "+d.name updateTaskStatus(d.id, 2); } @@ -57,7 +66,7 @@ class DayUpdateDistRefreshBatch extends BaseBatch{ def q = new BasicDBObject() q.put("status", 5);//未处理 TASK_COLL.find(q).each {d-> - rets << ["id":d._id.toString(),"city":d.city, "region":d.region, "name":d.name] + rets << ["id":d._id.toString(),"city":d.city, "region":d.region, "name":d.name, "type":d.type, "comm_id":d.comm_id] } return rets; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy index bf6e2c177..51e58e28e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy @@ -119,6 +119,13 @@ class FzDataUtils { } } + + static def removeById(id){ + def del_data = new BasicDBObject() + del_data.put("num_id", id) + DIST_COLL.remove(del_data) + } + static def saveDistrict(def m){ DBObject q = new BasicDBObject(); q.put("num_id",m.num_id) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy index 517b6b634..61cc61f88 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/linxsh/util/AddressUtil.groovy @@ -294,4 +294,8 @@ class AddressUtil { return result } + public static void main(String[] args){ + def addr = AddressUtil.formatAddress("福州", "北三环路201号琴亭信和小区") + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy index fd646bf20..03f3e2b73 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/looplineinfo/InsidePolygon.groovy @@ -52,7 +52,40 @@ class InsidePolygon { return list; } - + + + + public static List createPoint3(String points){ + + List alllist = new ArrayList(); + if(points){ + List arrs = new ArrayList(); + if(points.contains("|")){ + String[] array = points.split("\\|"); + arrs.addAll(array) + }else{ + arrs.add(points) + } + + for(def arrStr : arrs){ + List list = new ArrayList(); + String[] array = arrStr.split(";"); + for(int i =0 ;i> getPoints(String points){ String[] array = points.split("-"); List> list = new ArrayList>(); @@ -227,4 +260,16 @@ class InsidePolygon { } return false; } + + + public static def isInArea(lng, lat, pointList){ + def flag = false; + for(def pointArr : pointList){ + flag = InsidePolygon.isPtInPoly(lng, lat, pointArr) + if(flag){ + break; + } + } + return flag; + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy index c1a7d36eb..db1f5a13d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/CommitteeLatLng.groovy @@ -24,7 +24,7 @@ class CommitteeLatLng { static ExecutorService executorService = Executors.newFixedThreadPool(10) static void main(String[] args) { - dealPoi(new BasicDBObject("status_location", new BasicDBObject('$ne', 0)).append("year", 2021)) + dealPoi(new BasicDBObject("location", "").append("year", 2022)) //dealLocation() executorService.shutdown() } @@ -71,7 +71,7 @@ class CommitteeLatLng { if (amapPoi && amapPoi.size() > 0) { def poi = amapPoi[0] double similarity = CosineSimilarAlgorithm.getSimilarity(poi.name, name) - if (similarity <= 0.8) { + if (similarity <= 0.8 && !String.valueOf(poi.name).contains(name)) { amapPoi = GaoDeUtils.searchPoi(city, address, area, "") } poi = amapPoi[0] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy index 2a34dd4b3..30b2e3a65 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy @@ -55,13 +55,17 @@ class GaoDeUtils { * @return */ static String getGaodeKey(String type) { - Map params = new HashMap<>(); - params.put("type", type) - JSONObject json = HttpRequestUtil.getJsonContent("http://192.168.0.100:38080/FangJiaDataService/getAmapKey", params) - if (json.status == 0 && json.result != null) { - return json.result - } - System.exit(1); +// Map params = new HashMap<>(); +// params.put("type", type) +// JSONObject json = HttpRequestUtil.getJsonContent("http://192.168.0.100:38080/FangJiaDataService/getAmapKey", params) +// if (json.status == 0 && json.result != null) { +// return json.result +// } +// System.exit(1); + return "8796b9dfb3889b57c38e2fff1b7e51bd"; +// 'eb69e4ad2a9cdd31f163a0ed32effe6e', '60f764d228d64addf390e28d68a01a35', '66e6771767ab293ace441553c36621c1', +// 'a63254b4a1b2e6f4bb11058e0b5d9fa2', '743ad872ad39f0a10665b28fa968af0b', '3b7c1d201c403bb416b63535ed3d0e98', +// 'a34894d151fffff94f9a33bae3d5565c', '389e0a3a155e8d28728c3faede4ebd4f' } /** @@ -330,10 +334,10 @@ class GaoDeUtils { params.page = "${page}".toString() page++ params.key = this.getGaodeKey("v5/place/text") - JSONObject json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v5/place/text", params); + JSONObject json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v3/place/text", params); if (json == null) { params.key = this.getGaodeKey("v5/place/text") - json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v5/place/text", params); + json = HttpRequestUtil.getJsonContent("http://restapi.amap.com/v3/place/text", params); } if (json && json.info && json.info == "OK") { count = json.getString("count").toInteger() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/HttpUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/HttpUtils.groovy index ff11d6991..69c889afe 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/HttpUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/HttpUtils.groovy @@ -1,7 +1,9 @@ package com.fangjia.script.temp.shenjian.util +import net.sf.json.JSONObject import org.apache.commons.httpclient.HttpClient import org.apache.commons.httpclient.methods.PostMethod +import org.apache.commons.httpclient.methods.RequestEntity import org.apache.commons.httpclient.methods.StringRequestEntity /** @@ -26,4 +28,42 @@ class HttpUtils { } return false } + + + static def doPost2(String url, String jsonString){ + HttpClient httpClient = new HttpClient() + PostMethod postMethod = new PostMethod(url) + String responseMsg = null; + try{ + StringRequestEntity requestEntity = new StringRequestEntity( + jsonString, + "application/json", + "UTF-8"); + postMethod.setRequestEntity(requestEntity); + httpClient.executeMethod(postMethod); + InputStream is = postMethod.getResponseBodyAsStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8")); + StringBuffer sb = new StringBuffer(""); + String str= ""; + while((str = br.readLine()) != null){ + sb.append(str); + } + responseMsg = sb.toString(); + } catch (Exception ex) { + ex.printStackTrace(); + } finally { + postMethod.releaseConnection(); + } + return JSONObject.fromObject(responseMsg); + } + + public String encodeHtml(String html) { + String mh=html; + try { + mh=new String(html.getBytes("iso-8859-1")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return mh; + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy index b5f86bf1b..1d0ca1224 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy @@ -65,7 +65,7 @@ class DataStandardBatch extends BaseBatch{ def static final statusMap = ["城市未匹配":1,"区域未匹配":2,"小区匹配失败":3,"小区匹配成功":4,"异常错误":5, "无价格":6, "无名称":7] def static final websites = ["房估估","诸葛找房","安居客","搜房","中原地产","赶集", "链家","兔博士","城市房产","贝壳找房","Q房","Q房(新)","中原地产(新)","我爱我家","麦田","房途","C21","乐居","房产超市","58同城","365淘房","吉屋"] - public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) static { thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); matchErrorLogColl = CrawalDBUtil.getMatchErrorLogCol(); @@ -92,8 +92,10 @@ class DataStandardBatch extends BaseBatch{ cityMap.each{city,alias-> println "开始加载【${city}】" - def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"]) - districtMap.putAll(detailMap) +// if(city == "石家庄"){ + def detailMap = CommonDatautils.findAllCityDistrictNameAndAlias(city, "district", ["city","region","name","address","alias","addr_alias","mapping_alias","estate_type2"]) + districtMap.putAll(detailMap) +// } } while(flag){ @@ -157,6 +159,7 @@ class DataStandardBatch extends BaseBatch{ count++; }catch (Exception e){ + e.printStackTrace() println "处理:【${dbo.city}-${dbo.region}-${dbo.name}-${dbo.address}】发生异常,异常信息为:"+e.getMessage() }finally { @@ -455,13 +458,13 @@ class DataStandardBatch extends BaseBatch{ def addr = null; if(data.address){ - try{ - addr = DataUtil.formateAddress(data.city, data.address) - }catch (Exception e){ - addr = data.address; - } +// try{ +// addr = DataUtil.formateAddress(data.city, data.address) +// }catch (Exception e){ +// addr = data.address; +// } def copyObj = data - copyObj.address = addr +// copyObj.address = addr district = getMatchAddressFromMap(copyObj) if(district){ type = 8; @@ -833,7 +836,7 @@ class DataStandardBatch extends BaseBatch{ } } } - if(!dbo){ + if(!dbo && copyObj.address && isStandardRoad(copyObj.address)){ result = findAddrAliasFromMap(copyObj.city, copyObj.region, copyObj.address); if(result.size()==1){ dbo = result[0]; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy index 320e65b2f..4fe5dd4a7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/ThirdDataToGatherBatch.groovy @@ -42,7 +42,7 @@ class ThirdDataToGatherBatch extends BaseBatch{ } @Override void process(Object args) { - println SHORT_DATE + def citys = CommonDatautils.findAllCity(); def weekend = DateUtils.getFirstDayOfWeek(new Date()); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy index c68ba4a85..67858c081 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/TradeDealPriceStat.groovy @@ -28,7 +28,25 @@ class TradeDealPriceStat { static main(args) { def task = new TradeDealPriceStat() - task.run() +// task.run() + task.deleteRepeat() + } + + def deleteRepeat(){ + def q = new BasicDBObject() + q.put("source", "我爱我家") + def cursor = DEAL_PRICE.find(q).addOption(Bytes.QUERYOPTION_NOTIMEOUT) + def set = new HashSet() + for(def c : cursor){ + def tradeDate = DateUtils.formatDateByPattern(c.trade_date, "yyyyMMdd") + def key = c.city +"#"+c.region+"#"+c.district_name+"#"+c.avg_price+"#"+tradeDate + if(set.contains(key)){ + DEAL_PRICE.remove(new BasicDBObject('_id', c._id)) + println c._id + }else{ + set << key + } + } } def run(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy index b1a045e3f..520cf9f99 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy @@ -11,8 +11,8 @@ import org.bson.Document import static com.mongodb.client.model.Filters.* MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") -def startDate = DateUtil.parseDate("20230301", "yyyyMMdd") -def endDate = DateUtil.parseDate("20230401", "yyyyMMdd") +def startDate = DateUtil.parseDate("20230101", "yyyyMMdd") +def endDate = DateUtil.parseDate("20230201", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 @@ -38,6 +38,6 @@ while (startDate.before(endDate)) { startDate = nextDate } -ExcelUtils.write("D:\\数据\\东莞\\东莞银行总行(不去重).xlsx", data, "202303") +ExcelUtils.write("D:\\数据\\东莞\\东莞银行总行(不去重).xlsx", data, "202301") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy index bbc24f035..7b199ce7c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy @@ -11,8 +11,8 @@ import org.bson.Document import static com.mongodb.client.model.Filters.* MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") -def startDate = DateUtil.parseDate("20220901", "yyyyMMdd") -def endDate = DateUtil.parseDate("20221001", "yyyyMMdd") +def startDate = DateUtil.parseDate("20230201", "yyyyMMdd") +def endDate = DateUtil.parseDate("20230301", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java new file mode 100644 index 000000000..43ff2e085 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/bo/BuildingRatioBo.java @@ -0,0 +1,120 @@ +package com.fangjia.service.bo; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioBo implements Serializable { + + private static final long serialVersionUID = 1L; + private String id; + private String city_name; + private String region; + private String district; + private String building_name; + private String building_avg_price; + private String avg_price; + private Double ratio; + private Date c_date; + private Date m_date; + private String create_user; + private String note; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity_name() { + return city_name; + } + + public void setCity_name(String city_name) { + this.city_name = city_name; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getBuilding_name() { + return building_name; + } + + public void setBuilding_name(String building_name) { + this.building_name = building_name; + } + + public Double getRatio() { + return ratio; + } + + public void setRatio(Double ratio) { + this.ratio = ratio; + } + + public Date getC_date() { + return c_date; + } + + public void setC_date(Date c_date) { + this.c_date = c_date; + } + + public Date getM_date() { + return m_date; + } + + public void setM_date(Date m_date) { + this.m_date = m_date; + } + + public String getCreate_user() { + return create_user; + } + + public void setCreate_user(String create_user) { + this.create_user = create_user; + } + + public String getNote() { + return note; + } + + public void setNote(String note) { + this.note = note; + } + + public String getBuilding_avg_price() { + return building_avg_price; + } + + public void setBuilding_avg_price(String building_avg_price) { + this.building_avg_price = building_avg_price; + } + + public String getAvg_price() { + return avg_price; + } + + public void setAvg_price(String avg_price) { + this.avg_price = avg_price; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java index 4e67035de..7c05fe0fd 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java @@ -24,5 +24,5 @@ public interface DistrictUpdateTaskService { void createTask(District district); - void createTask(District district, int status); + void createTask(District district, int status, Integer optType); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java index 09cb92118..7c0fd6d02 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java @@ -32,8 +32,8 @@ public class DistrictUpdateTaskServiceImpl implements DistrictUpdateTaskService } @Override - public void createTask(District district, int status) { - districtUpdateTaskDao.createTask(district, status); + public void createTask(District district, int status, Integer type) { + districtUpdateTaskDao.createTask(district, status, type); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java new file mode 100644 index 000000000..36a450706 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioService.java @@ -0,0 +1,18 @@ +package com.fangjia.service.mongo.bkoff; + +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; + +import java.util.List; +import java.util.Map; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public interface BuildingRatioService { + public void save(BuildingRatio buildingRatio); + public void deleteById(String id); + public void saveOrUpdateByBuildingName(String city, String region, String district, String building_name, Map data); + public BuildingRatio findBuildingRatioById(String id); + public List findAllByBuildingName(String city, String region, String district, String building_name); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java new file mode 100644 index 000000000..bee82f5dd --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/bkoff/BuildingRatioServiceImpl.java @@ -0,0 +1,81 @@ +package com.fangjia.service.mongo.bkoff; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.SortParam; +import com.fangjia.dal.mongo.dao.bkoff.BuildingRatioDao; +import com.fangjia.dal.mongo.model.bkoff.BuildingRatio; +import com.fangjia.dal.sql.model.FjtUsers; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @author zhaojixiang + * @since 2023/7/5 + */ +public class BuildingRatioServiceImpl implements BuildingRatioService{ + + private BuildingRatioDao buildingRatioDao; + + @Override + public void save(BuildingRatio buildingRatio) { + + this.buildingRatioDao.save(buildingRatio); + } + + @Override + public void deleteById(String id) { + this.buildingRatioDao.deleteById(id); + } + @Override + public void saveOrUpdateByBuildingName(String city, String region, String district, String building_name, Map data) { + List params = new ArrayList(); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("region", region)); + params.add(new QueryParam("district", district)); + params.add(new QueryParam("building_name", building_name)); + data.put("city", city); + data.put("region", region); + data.put("district", district); + data.put("building_name", building_name); + this.buildingRatioDao.updateByParams(data, params, true); + } + + @Override + public BuildingRatio findBuildingRatioById(String id) { + + return this.buildingRatioDao.findById(id); + } + + @Override + public List findAllByBuildingName(String city, String region, String district, String building_name) { + List params = new ArrayList(); + if(StringUtils.isNotBlank(city)){ + params.add(new QueryParam("city", city)); + } + if(StringUtils.isNotBlank(region)){ + params.add(new QueryParam("region", region)); + } + if(StringUtils.isNotBlank(district)){ + params.add(new QueryParam("district", district)); + } + if(StringUtils.isNotBlank(building_name)){ + params.add(new QueryParam("building_name", building_name)); + } + + List sortParams = new ArrayList(); + sortParams.add(new SortParam("m_date", false)); + + return this.buildingRatioDao.findAllByParams(params, sortParams); + } + + public BuildingRatioDao getBuildingRatioDao() { + return buildingRatioDao; + } + + public void setBuildingRatioDao(BuildingRatioDao buildingRatioDao) { + this.buildingRatioDao = buildingRatioDao; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java index 4eae77e54..8c09268bf 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java @@ -26,6 +26,7 @@ public class ApiUserBo implements Serializable { private Date deadTime; private String manager; private String priceType; + private Integer isMonitor; public String getPriceType() { return priceType; @@ -162,4 +163,12 @@ public class ApiUserBo implements Serializable { public void setManager(String manager) { this.manager = manager; } + + public Integer getIsMonitor() { + return isMonitor; + } + + public void setIsMonitor(Integer isMonitor) { + this.isMonitor = isMonitor; + } }